diff --git a/chef/cookbooks/dhcp/libraries/helpers.rb b/chef/cookbooks/dhcp/libraries/helpers.rb
index 8ad0585a3f..522e479dec 100644
--- a/chef/cookbooks/dhcp/libraries/helpers.rb
+++ b/chef/cookbooks/dhcp/libraries/helpers.rb
@@ -1,5 +1,5 @@
 module DhcpHelper
-  def self.config_filename(base, ip_version, extension=".conf")
+  def self.config_filename(base, ip_version, extension = ".conf")
     if ip_version == "4"
       "#{base}#{extension}"
     else
diff --git a/chef/cookbooks/dhcp/providers/subnet.rb b/chef/cookbooks/dhcp/providers/subnet.rb
index dd1a22c06a..f99df276cc 100644
--- a/chef/cookbooks/dhcp/providers/subnet.rb
+++ b/chef/cookbooks/dhcp/providers/subnet.rb
@@ -18,7 +18,7 @@
   filename = "/etc/dhcp3/subnets.d/#{new_resource.subnet}.conf"
   template filename do
     cookbook "dhcp"
-    source "#{subnet_template}"
+    source subnet_template
     variables(
       network: new_resource.network,
       options: new_resource.options,
@@ -32,9 +32,10 @@
       notifies :restart, resources(service: "dhcp3-server"), :delayed
     end
   end
+  subnet_file = DhcpHelper.config_filename("subnet_list", new_resource.ip_version)
   utils_line "include \"#{filename}\";" do
     action :add
-    file "/etc/dhcp3/subnets.d/#{DhcpHelper.config_filename("subnet_list", new_resource.ip_version)}"
+    file "/etc/dhcp3/subnets.d/#{subnet_file}"
     if node[:provisioner][:enable_pxe]
       notifies :restart, resources(service: "dhcp3-server"), :delayed
     end
diff --git a/chef/cookbooks/dhcp/recipes/default.rb b/chef/cookbooks/dhcp/recipes/default.rb
index e3ef43ba5c..04d4ca259c 100644
--- a/chef/cookbooks/dhcp/recipes/default.rb
+++ b/chef/cookbooks/dhcp/recipes/default.rb
@@ -174,7 +174,7 @@
 
 service "dhcp3-server" do
   if %w(suse rhel).include?(node[:platform_family])
-    service_name "#{DhcpHelper.config_filename("dhcpd", admin_network.ip_version, "")}"
+    service_name DhcpHelper.config_filename("dhcpd", admin_network.ip_version, "")
   elsif node[:platform] == "ubuntu"
     case node[:lsb][:codename]
     when "maverick"