diff --git a/metadata.rb b/metadata.rb
index dbc83b2..9e34d24 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -3,9 +3,10 @@
 maintainer_email "support@atalanta-systems.com"
 license          "Apache 2.0"
 description      "Installs/Configures chruby"
-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+long_description IO.read(File.join(File.dirname(__FILE__), "README.md"))
 version          "0.2.1"
-depends		 "ark"
-depends		 "ruby_build"
-supports	 "centos"
-supports	 "ubuntu"
+
+depends  "ark"
+depends  "ruby_build"
+supports "centos"
+supports "ubuntu"
diff --git a/recipes/system.rb b/recipes/system.rb
index 1603160..6ec84f9 100644
--- a/recipes/system.rb
+++ b/recipes/system.rb
@@ -18,7 +18,7 @@
   if flag
     ruby_build_ruby ruby do
       prefix_path "/opt/rubies/#{ruby}"
-    end   
+    end
   end
 end
 
diff --git a/templates/default/chruby.sh.erb b/templates/default/chruby.sh.erb
index 3447461..cbebac1 100644
--- a/templates/default/chruby.sh.erb
+++ b/templates/default/chruby.sh.erb
@@ -4,11 +4,11 @@ source /usr/local/chruby/share/chruby/chruby.sh
 RUBIES+=(/opt/chef/embedded)
 <% end -%>
 
-<% if node['chruby']['use_rvm'] && ! Dir["~/.rubies/*"].empty? -%>
+<% if node['chruby']['use_rvm_rubies'] && ! Dir["~/.rubies/*"].empty? -%>
 RUBIES+=($HOME/.rvm/rubies/*)
 <% end -%>
 
-<% if node['chruby']['use_rbenv'] && ! Dir["~/.rbenv/versions/*"].empty? -%>
+<% if node['chruby']['use_rbenv_rubies'] && ! Dir["~/.rbenv/versions/*"].empty? -%>
 RUBIES+=($HOME/.rbenv/rubies/*)
 <% end -%>
 
@@ -23,4 +23,3 @@ chruby <%= node['chruby']['default'] %>
 <% end -%>
 
 <%= node['chruby']['auto_switch'] && "source /usr/local/chruby/share/chruby/auto.sh" %>
-