diff --git a/spec/classes/munin_master_spec.rb b/spec/classes/munin_master_spec.rb
index 0d6cea1..f56374b 100644
--- a/spec/classes/munin_master_spec.rb
+++ b/spec/classes/munin_master_spec.rb
@@ -1,189 +1,185 @@
 require 'spec_helper'
 
 _conf_dir = {}
 _conf_dir.default = '/etc/munin'
 _conf_dir['Solaris'] = '/opt/local/etc/munin'
 _conf_dir['FreeBSD'] = '/usr/local/etc/munin'
 
 _package = {}
 _package.default = 'munin'
 _package['FreeBSD'] = 'munin-master'
 
 describe 'munin::master' do
-
   on_supported_os.each do |os, facts|
-
     # Avoid testing on distributions similar to RedHat and Debian
     next if os =~ /^(ubuntu|centos|scientific|oraclelinux)-/
 
     # No need to test all os versions as long as os version is not
     # used in the params class
     next if os =~ /^(debian-[67]|redhat-[56]|freebsd-9)-/
 
     context "on #{os}" do
       let(:facts) do
         facts
       end
 
       conf_dir = _conf_dir[facts[:osfamily]]
       package = _package[facts[:osfamily]]
 
       it { should compile.with_all_deps }
 
       it { should contain_package(package) }
 
       context 'with default params' do
         it do
           should contain_file("#{conf_dir}/munin.conf")
-                  .with_content(/graph_strategy\s+cgi/)
-                  .with_content(/html_strategy\s+cgi/)
+            .with_content(/graph_strategy\s+cgi/)
+            .with_content(/html_strategy\s+cgi/)
         end
 
         it do
           should contain_file("#{conf_dir}/munin-conf.d")
-                  .with_ensure('directory')
+            .with_ensure('directory')
         end
       end
 
       context 'with html_strategy => cron' do
         let (:params) { { :html_strategy => 'cron' } }
         it { should compile.with_all_deps }
         it do
           should contain_file("#{conf_dir}/munin.conf")
-                  .with_content(/html_strategy\s+cron/)
+            .with_content(/html_strategy\s+cron/)
         end
       end
 
       context 'with graph_strategy => cron' do
         let (:params) { { :graph_strategy => 'cron' } }
         it { should compile.with_all_deps }
         it do
           should contain_file("#{conf_dir}/munin.conf")
-                  .with_content(/graph_strategy\s+cron/)
+            .with_content(/graph_strategy\s+cron/)
         end
       end
 
       context 'with dbdir => /var/lib/munin' do
         let (:params) { { :dbdir => '/var/lib/munin' } }
         it { should compile.with_all_deps }
         it do
           should contain_file("#{conf_dir}/munin.conf")
-                  .with_content(/dbdir\s+\/var\/lib\/munin/)
+            .with_content(/dbdir\s+\/var\/lib\/munin/)
         end
       end
 
       context 'with htmldir => /var/www/munin' do
         let (:params) { { :htmldir => '/var/www/munin' } }
         it { should compile.with_all_deps }
         it do
           should contain_file("#{conf_dir}/munin.conf")
-                  .with_content(/htmldir\s+\/var\/www\/munin/)
+            .with_content(/htmldir\s+\/var\/www\/munin/)
         end
       end
 
       context 'with logdir => /var/log/munin' do
         let (:params) { { :dbdir => '/var/log/munin' } }
         it { should compile.with_all_deps }
         it do
           should contain_file("#{conf_dir}/munin.conf")
-                  .with_content(/dbdir\s+\/var\/log\/munin/)
+            .with_content(/dbdir\s+\/var\/log\/munin/)
         end
       end
 
       context 'with rundir => /var/run/munin' do
         let (:params) { { :dbdir => '/var/run/munin' } }
         it { should compile.with_all_deps }
         it do
           should contain_file("#{conf_dir}/munin.conf")
-                  .with_content(/dbdir\s+\/var\/run\/munin/)
+            .with_content(/dbdir\s+\/var\/run\/munin/)
         end
       end
 
       context 'with tls => enabled' do
         let(:params) do
           {
             :tls => 'enabled',
             :tls_certificate => '/path/to/certificate.pem',
             :tls_private_key => '/path/to/key.pem',
             :tls_verify_certificate => 'yes',
           }
         end
 
         it { should compile.with_all_deps }
         it do
           should contain_file("#{conf_dir}/munin.conf")
-                  .with_content(/tls = enabled/)
-                  .with_content(/tls_certificate = \/path\/to\/certificate\.pem/)
-                  .with_content(/tls_private_key = \/path\/to\/key\.pem/)
-                  .with_content(/tls_verify_certificate = yes/)
+            .with_content(/tls = enabled/)
+            .with_content(/tls_certificate = \/path\/to\/certificate\.pem/)
+            .with_content(/tls_private_key = \/path\/to\/key\.pem/)
+            .with_content(/tls_verify_certificate = yes/)
         end
       end
 
       context 'with node_definitions' do
         let(:params) do
           {
             :node_definitions => {
               'node-a' => {
                 'address' => 'munin://node-a.example.com',
               },
               'node-b' => {
                 'address' => 'munin://node-b.example.com',
               }
             }
           }
         end
         it { should compile.with_all_deps }
         it { should contain_munin__master__node_definition('node-a') }
         it { should contain_munin__master__node_definition('node-b') }
       end
 
       context 'with extra_config' do
         token = '1b7febce-bb2d-4c18-b889-84c73538a900'
         let(:params) do
-          { :extra_config => [ token ] }
+          { :extra_config => [token] }
         end
         it { should compile.with_all_deps }
         it do
           should contain_file("#{conf_dir}/munin.conf")
-                  .with_content(/#{token}/)
+            .with_content(/#{token}/)
         end
       end
 
       context 'with extra_config set to a string' do
         token = '1b7febce-bb2d-4c18-b889-84c73538a900'
         let(:params) do
           { :extra_config => token }
         end
         it { should raise_error(Puppet::Error, /is not an Array/) }
       end
 
       ['test.example.com', 'invalid/hostname.example.com'].each do |param|
         context "with host_name => #{param}" do
           let(:params) do
             { :host_name => param }
           end
           if param =~ /invalid/
             it { should raise_error(Puppet::Error, /valid domain name/) }
           else
             it { should compile.with_all_deps }
           end
         end
       end
 
       %w(enabled disabled mine unclaimed invalid).each do |param|
         context "with collect_nodes => #{param}" do
           let(:params) do
             { :collect_nodes => param }
           end
           if param == 'invalid'
             it { should raise_error(Puppet::Error, /validate_re/) }
           else
             it { should compile.with_all_deps }
           end
         end
       end
-
     end
   end
-
 end
diff --git a/spec/classes/munin_node_export_spec.rb b/spec/classes/munin_node_export_spec.rb
index 6487a60..a0346ed 100644
--- a/spec/classes/munin_node_export_spec.rb
+++ b/spec/classes/munin_node_export_spec.rb
@@ -1,67 +1,65 @@
 require 'spec_helper'
 
 _params = {
   :address => '127.0.0.2',
   :fqn => 'example;foo.example.com',
   :masterconfig => [],
   :mastername => 'munin.example.com'
 }
 _extra_nodes = {
   'example;svc10.example.com' => {
     'address' => '127.0.0.10',
     'config'  => [],
   },
   'example;svc11.example.com' => {
     'address' => '127.0.0.11',
     'config'  => ['env foo.warn 12'],
   }
 }
 
 describe 'munin::node::export' do
-
   on_supported_os.each do |os, facts|
-
     context "on #{os}" do
       let(:facts) { facts }
       let(:params) { _params }
 
       it { should compile.with_all_deps }
 
       it do
         expect(exported_resources).to have_munin__master__node_definition_resource_count(1)
       end
       it do
         expect(exported_resources).to contain_munin__master__node_definition(_params[:fqn])
-                                        .with_address(_params[:address])
-                                        .with_mastername(_params[:mastername])
-                                        .with_tag(["munin::master::#{_params[:mastername]}"])
+          .with_address(_params[:address])
+          .with_mastername(_params[:mastername])
+          .with_tag(["munin::master::#{_params[:mastername]}"])
       end
     end
 
     context "on #{os} with extra nodes" do
       let(:facts) { facts }
       let(:params) { _params.merge({ :node_definitions => _extra_nodes }) }
 
       it { should compile.with_all_deps }
 
       it do
         expect(exported_resources).to have_munin__master__node_definition_resource_count(3)
       end
       it do
         expect(exported_resources).to contain_munin__master__node_definition(_params[:fqn])
-                                        .with_address(_params[:address])
-                                        .with_mastername(_params[:mastername])
-                                        .with_tag("munin::master::#{_params[:mastername]}")
+          .with_address(_params[:address])
+          .with_mastername(_params[:mastername])
+          .with_tag("munin::master::#{_params[:mastername]}")
       end
       _extra_nodes.each_key do |n|
         it do
           expect(exported_resources).to contain_munin__master__node_definition(n)
-                                          .with_address(_extra_nodes[n]['address'])
-                                          .with_mastername(_params[:mastername])
-                                          .with_config(_extra_nodes[n]['config'])
-                                          .with_tag("munin::master::#{_params[:mastername]}")
+            .with_address(_extra_nodes[n]['address'])
+            .with_mastername(_params[:mastername])
+            .with_config(_extra_nodes[n]['config'])
+            .with_tag("munin::master::#{_params[:mastername]}")
         end
       end
     end
   end
 end
diff --git a/spec/classes/munin_node_spec.rb b/spec/classes/munin_node_spec.rb
index 1c4ff91..bd17a3c 100644
--- a/spec/classes/munin_node_spec.rb
+++ b/spec/classes/munin_node_spec.rb
@@ -1,184 +1,178 @@
 require 'spec_helper'
 
 _conf_dir = {}
 _conf_dir.default = '/etc/munin'
 _conf_dir['DragonFly'] = '/usr/local/etc/munin'
 _conf_dir['FreeBSD'] = '/usr/local/etc/munin'
 _conf_dir['Solaris'] = '/opt/local/etc/munin'
 
 describe 'munin::node' do
-
   on_supported_os.each do |os, facts|
-
     # Avoid testing on distributions similar to RedHat and Debian
     next if os =~ /^(ubuntu|centos|scientific|oraclelinux)-/
 
     # No need to test all os versions as long as os version is not
     # used in the params class
     next if os =~ /^(debian-[67]|redhat-[56]|freebsd-9)-/
 
     context "on #{os}" do
       let(:facts) { facts }
 
       it { should compile.with_all_deps }
 
       it { should contain_package('munin-node') }
 
       munin_confdir = _conf_dir[facts[:osfamily]]
 
       munin_node_conf = "#{munin_confdir}/munin-node.conf"
       munin_plugin_dir = "#{munin_confdir}/plugins"
       munin_plugin_conf_dir = "#{munin_confdir}/plugin-conf.d"
 
       munin_node_service =
         case facts[:osfamily]
         when 'Solaris' then 'smf:/munin-node'
         else 'munin-node'
         end
 
       log_dir =
         case facts[:osfamily]
         when 'Solaris' then '/var/opt/log/munin'
         when 'RedHat' then '/var/log/munin-node'
         else '/var/log/munin'
         end
 
       it { should contain_service(munin_node_service) }
       it { should contain_file(munin_node_conf) }
 
       context 'with no parameters' do
         it { should compile.with_all_deps }
         it do
           should contain_service(munin_node_service)
-                  .without_ensure()
+            .without_ensure()
         end
         it do
           should contain_file(munin_node_conf)
-                  .with_content(/host_name\s+foo.example.com/)
-                  .with_content(/log_file\s+#{log_dir}\/munin-node.log/)
+            .with_content(/host_name\s+foo.example.com/)
+            .with_content(/log_file\s+#{log_dir}\/munin-node.log/)
         end
       end
 
       context 'with parameter allow' do
         let(:params) do
           { allow: ['2001:db8:1::',
                     '2001:db8:2::/64',
                     '192.0.2.129',
                     '192.0.2.0/25',
-                    '192\.0\.2']
-          }
+                    '192\.0\.2'] }
         end
         it { should compile.with_all_deps }
         it do
           should contain_file(munin_node_conf)
-                  .with_content(/^cidr_allow 192.0.2.0\/25$/)
-                  .with_content(/^cidr_allow 2001:db8:2::\/64$/)
-                  .with_content(/^allow \^192\\.0\\.2\\.129\$$/)
-                  .with_content(/^allow 192\\.0\\.2$/)
-                  .with_content(/^allow \^2001:db8:1::\$$/)
+            .with_content(/^cidr_allow 192.0.2.0\/25$/)
+            .with_content(/^cidr_allow 2001:db8:2::\/64$/)
+            .with_content(/^allow \^192\\.0\\.2\\.129\$$/)
+            .with_content(/^allow 192\\.0\\.2$/)
+            .with_content(/^allow \^2001:db8:1::\$$/)
         end
       end
 
       context 'with parameter host_name' do
         let(:params) do
           { host_name: 'something.example.com' }
         end
         it { should compile.with_all_deps }
         it do
           should contain_file(munin_node_conf)
-                  .with_content(/host_name\s+something.example.com/)
+            .with_content(/host_name\s+something.example.com/)
         end
       end
 
       context 'with parameter service_ensure' do
         let(:params) do
           { service_ensure: 'running' }
         end
         it { should compile.with_all_deps }
         it do
           should contain_service('munin-node')
             .with_ensure('running')
         end
       end
 
       context 'logging to syslog' do
         context 'defaults' do
           let(:params) do
             { log_destination: 'syslog' }
           end
-          it{ should compile.with_all_deps }
+          it { should compile.with_all_deps }
           it do
             should contain_file(munin_node_conf)
-                    .with_content(/log_file\s+Sys::Syslog/)
+              .with_content(/log_file\s+Sys::Syslog/)
           end
         end
 
         context 'with syslog options' do
           let(:params) do
             { log_destination: 'syslog',
-              syslog_facility: 'local1',
-            }
+              syslog_facility: 'local1', }
           end
-          it{ should compile.with_all_deps }
+          it { should compile.with_all_deps }
           it do
             should contain_file(munin_node_conf)
-                    .with_content(/log_file\s+Sys::Syslog/)
-                    .with_content(/syslog_facility\s+local1/)
+              .with_content(/log_file\s+Sys::Syslog/)
+              .with_content(/syslog_facility\s+local1/)
           end
         end
 
         context 'with syslog_facility set to wrong value ' do
           let(:params) do
             { log_destination: 'syslog',
-              syslog_facility: 'wrong',
-            }
+              syslog_facility: 'wrong', }
           end
           it { expect { should compile.with_all_deps }.to raise_error(/validate_re/) }
         end
       end
 
       context 'purge_configs' do
         context 'set' do
           let(:params) { { purge_configs: true } }
           it { should compile.with_all_deps }
           it do
             should contain_file(munin_plugin_dir)
-                    .with_ensure('directory')
-                    .with_recurse(true)
-                    .with_purge(true)
+              .with_ensure('directory')
+              .with_recurse(true)
+              .with_purge(true)
           end
           it do
             should contain_file(munin_plugin_conf_dir)
-                    .with_ensure('directory')
-                    .with_recurse(true)
-                    .with_purge(true)
+              .with_ensure('directory')
+              .with_recurse(true)
+              .with_purge(true)
           end
         end
         context 'unset' do
           it { should compile.with_all_deps }
           it { should_not contain_file(munin_plugin_dir) }
           it { should_not contain_file(munin_plugin_conf_dir) }
         end
       end
 
       context 'timeout' do
         context 'set' do
           let(:params) { { timeout: 123 } }
           it { should compile.with_all_deps }
           it do
             should contain_file(munin_node_conf)
-                    .with_content(/^timeout 123/)
+              .with_content(/^timeout 123/)
           end
         end
         context 'unset' do
           it { should compile.with_all_deps }
           it do
             should contain_file(munin_node_conf)
-                    .without_content(/^timeout/)
+              .without_content(/^timeout/)
           end
         end
       end
-
     end
   end
 end
diff --git a/spec/defines/munin_plugin_spec.rb b/spec/defines/munin_plugin_spec.rb
index 3769802..bbd4098 100644
--- a/spec/defines/munin_plugin_spec.rb
+++ b/spec/defines/munin_plugin_spec.rb
@@ -1,143 +1,136 @@
 require 'spec_helper'
 
 _conf_dir = {}
 _conf_dir.default = '/etc/munin'
 _conf_dir['Solaris'] = '/opt/local/etc/munin'
 _conf_dir['FreeBSD'] = '/usr/local/etc/munin'
 
 _share_dir = {}
 _share_dir.default = '/usr/share/munin'
 _share_dir['Solaris'] = '/opt/local/share/munin'
 _share_dir['FreeBSD'] = '/usr/local/share/munin'
 
 describe 'munin::plugin', :type => 'define' do
-
   let(:title) { 'testplugin' }
 
   on_supported_os.each do |os, facts|
-
     # Avoid testing on distributions similar to RedHat and Debian
     next if os =~ /^(ubuntu|centos|scientific|oraclelinux)-/
 
     # No need to test all os versions as long as os version is not
     # used in the params class
     next if os =~ /^(debian-[67]|redhat-[56]|freebsd-9)-/
 
     context "on #{os}" do
       let(:facts) do
         facts
       end
 
       conf_dir = _conf_dir[facts[:osfamily]]
       plugin_share_dir = "#{_share_dir[facts[:osfamily]]}/plugins"
 
       context 'with no parameters' do
         it do
           expect { should contain_file("#{conf_dir}/plugins/testplugin") }
             .to raise_error("expected that the catalogue would contain File[#{conf_dir}/plugins/testplugin]")
         end
         it do
           should contain_file("#{conf_dir}/plugin-conf.d/testplugin.conf")
-                  .with_ensure('absent')
+            .with_ensure('absent')
         end
       end
 
       context 'with ensure=link parameter' do
         let(:params) { { :ensure => 'link' } }
         it do
           should contain_file("#{conf_dir}/plugins/testplugin")
-                  .with_ensure('link')
-                  .with_target("#{plugin_share_dir}/testplugin")
+            .with_ensure('link')
+            .with_target("#{plugin_share_dir}/testplugin")
         end
         it do
           should contain_file("#{conf_dir}/plugin-conf.d/testplugin.conf")
-                  .with_ensure('absent')
+            .with_ensure('absent')
         end
       end
 
       context 'with ensure=link and target parameters' do
         let(:title) { 'test_foo' }
         let(:params) do
           { :ensure => 'link',
             :target => 'test_' }
         end
         it do
           should contain_file("#{conf_dir}/plugins/test_foo")
-                  .with_ensure('link')
-                  .with_target("#{plugin_share_dir}/test_")
+            .with_ensure('link')
+            .with_target("#{plugin_share_dir}/test_")
         end
         it do
           should contain_file("#{conf_dir}/plugin-conf.d/test_foo.conf")
-                  .with_ensure('absent')
+            .with_ensure('absent')
         end
       end
 
       context 'with ensure=present and source parameters' do
         let(:params) do
           { :ensure => 'present',
             :source => 'puppet:///modules/munin/plugins/testplugin' }
         end
         it do
           should contain_file("#{conf_dir}/plugins/testplugin")
-                    .with_ensure('present')
-                    .with_source('puppet:///modules/munin/plugins/testplugin')
+            .with_ensure('present')
+            .with_source('puppet:///modules/munin/plugins/testplugin')
         end
         it do
           should contain_file("#{conf_dir}/plugin-conf.d/testplugin.conf")
-                  .with_ensure('absent')
+            .with_ensure('absent')
         end
       end
 
       context 'with ensure=present, source and config parameters' do
         let(:params) do
           { :ensure => 'present',
             :source => 'puppet:///modules/munin/plugins/testplugin',
-            :config => [ 'something wonderful' ],
-          }
+            :config => ['something wonderful'], }
         end
         it do
           should contain_file("#{conf_dir}/plugins/testplugin")
-                  .with_ensure('present')
-                  .with_source('puppet:///modules/munin/plugins/testplugin')
+            .with_ensure('present')
+            .with_source('puppet:///modules/munin/plugins/testplugin')
         end
         it do
           should contain_file("#{conf_dir}/plugin-conf.d/testplugin.conf")
-                  .with_ensure('present')
-                  .with_content(/something wonderful/)
+            .with_ensure('present')
+            .with_content(/something wonderful/)
         end
       end
 
       context 'only configuration' do
         let(:params) do
           { :config => ['env.rootdn cn=admin,dc=example,dc=org'],
-            :config_label => 'slapd_*',
-          }
+            :config_label => 'slapd_*', }
         end
         it do
           should contain_file("#{conf_dir}/plugin-conf.d/testplugin.conf")
-                  .with_ensure('present')
-                  .with_content(/env.rootdn/)
-
+            .with_ensure('present')
+            .with_content(/env.rootdn/)
         end
         it do
           expect { should contain_file("#{conf_dir}/plugins/testplugin") }
             .to raise_error("expected that the catalogue would contain File[#{conf_dir}/plugins/testplugin]")
         end
       end
 
       context 'with absolute target' do
         let(:params) do
           { ensure: 'link',
             target: '/full/path/to/testplugin' }
         end
         it do
           should contain_file("#{conf_dir}/plugins/testplugin")
-                  .with_ensure('link')
-                  .with_target('/full/path/to/testplugin')
+            .with_ensure('link')
+            .with_target('/full/path/to/testplugin')
         end
       end
-
     end
   end
-
 end
diff --git a/spec/defines/regression_13_munin_plugin_config_name_spec.rb b/spec/defines/regression_13_munin_plugin_config_name_spec.rb
index f663ba2..06af7ec 100644
--- a/spec/defines/regression_13_munin_plugin_config_name_spec.rb
+++ b/spec/defines/regression_13_munin_plugin_config_name_spec.rb
@@ -1,49 +1,46 @@
 require 'spec_helper'
 
 _conf_dir = {}
 _conf_dir.default = '/etc/munin'
 _conf_dir['Solaris'] = '/opt/local/etc/munin'
 _conf_dir['FreeBSD'] = '/usr/local/etc/munin'
 
 describe 'munin::plugin' do
   let(:title) { 'testplugin' }
 
   on_supported_os.each do |os, facts|
-
     # Avoid testing on distributions similar to RedHat and Debian
     next if os =~ /^(ubuntu|centos|scientific|oraclelinux)-/
 
     # No need to test all os versions as long as os version is not
     # used in the params class
     next if os =~ /^(debian-[67]|redhat-[56]|freebsd-9)-/
 
     context "on #{os}" do
       let(:facts) { facts }
 
       conf_dir = _conf_dir[facts[:osfamily]]
 
       context 'with config_label unset, label should be set to title' do
         let(:params) do
           { config: ['env.foo bar'] }
         end
 
         it do
           should contain_file("#{conf_dir}/plugin-conf.d/testplugin.conf")
-                  .with_content(/^\[testplugin\]$/)
+            .with_content(/^\[testplugin\]$/)
         end
       end
 
       context 'with config_label set, label should be set to config_label' do
         let(:params) do
           { config: ['env.foo bar'], config_label: 'foo_' }
         end
         it do
           should contain_file("#{conf_dir}/plugin-conf.d/testplugin.conf")
-                  .with_content(/^\[foo_\]$/)
+            .with_content(/^\[foo_\]$/)
         end
       end
     end
-
   end
-
 end