diff --git a/recipes/api.rb b/recipes/api.rb
index 8e7da1a..c57a3ab 100644
--- a/recipes/api.rb
+++ b/recipes/api.rb
@@ -24,18 +24,10 @@ class ::Chef::Recipe
   include ::Openstack
 end
 
-platform_options = node["cinder"]["platform"]
-
-platform_options["cinder_api_packages"].each do |pkg|
-  package pkg do
-    action :upgrade
-    options platform_options["package_overrides"]
-  end
-end
-
 service "cinder-api" do
   service_name platform_options["cinder_api_service"]
   supports :status => true, :restart => true
+
   action :enable
 end
 
@@ -44,12 +36,13 @@ identity_endpoint = endpoint "identity-api"
 
 template "/etc/cinder/api-paste.ini" do
   source "api-paste.ini.erb"
-  group node["cinder"]["group"]
-  owner node["cinder"]["user"]
-  mode 00644
+  group  node["cinder"]["group"]
+  owner  node["cinder"]["user"]
+  mode   00644
   variables(
     "identity_endpoint" => identity_endpoint,
     "identity_admin_endpoint" => identity_admin_endpoint
   )
+
   notifies :restart, resources(:service => "cinder-api"), :immediately
 end
diff --git a/recipes/common.rb b/recipes/common.rb
index 0aac0ac..36d7408 100644
--- a/recipes/common.rb
+++ b/recipes/common.rb
@@ -30,11 +30,22 @@ else
   node.set_unless["cinder"]["service_pass"] = secure_password
 end
 
+platform_options = node["cinder"]["platform"]
+
+platform_options["cinder_api_packages"].each do |pkg|
+  package pkg do
+    options platform_options["package_overrides"]
+
+    action :upgrade
+  end
+end
+
 directory "/etc/cinder" do
-  action :create
   group node["cinder"]["group"]
   owner node["cinder"]["user"]
-  mode 00700
+  mode  00700
+
+  action :create
 end
 
 db_user = node["cinder"]["db"]["username"]
@@ -50,9 +61,9 @@ glance_api_endpoint = endpoint "image-api"
 
 template "/etc/cinder/cinder.conf" do
   source "cinder.conf.erb"
-  group node["cinder"]["group"]
-  owner node["cinder"]["user"]
-  mode 00644
+  group  node["cinder"]["group"]
+  owner  node["cinder"]["user"]
+  mode   00644
   variables(
     :sql_connection => sql_connection,
     :rabbit_host => rabbit_info["host"],
@@ -60,6 +71,7 @@ template "/etc/cinder/cinder.conf" do
     :glance_host => glance_api_endpoint.host,
     :glance_port => glance_api_endpoint.port
   )
+
   notifies :restart, resources(:service => "cinder-api"), :immediately
   notifies :restart, resources(:service => "cinder-scheduler"), :immediately
   notifies :restart, resources(:service => "cinder-volume"), :immediately
diff --git a/recipes/scheduler.rb b/recipes/scheduler.rb
index 7008cf6..8884cf6 100644
--- a/recipes/scheduler.rb
+++ b/recipes/scheduler.rb
@@ -24,13 +24,15 @@ platform_options = node["cinder"]["platform"]
 
 platform_options["cinder_scheduler_packages"].each do |pkg|
   package pkg do
-    action :upgrade
     options platform_options["package_overrides"]
+
+    action :upgrade
   end
 end
 
 service "cinder-scheduler" do
   service_name platform_options["cinder_scheduler_service"]
   supports :status => true, :restart => true
+
   action [ :enable, :start ]
 end