diff --git a/manifests/module.pp b/manifests/module.pp
index 29320abb155f5e2d92ecf0b1575368a228943f75..a92ea9e698ad6bd7b60a1cbe4d6e05b02f36471b 100644
--- a/manifests/module.pp
+++ b/manifests/module.pp
@@ -7,9 +7,9 @@ define irc_bouncer::module (
   $arg_str = join($args, ' ')
 
   file_line { "ZNC module ${module}":
-    path => '/var/lib/znc/configs/znc.conf',
     ensure => present,
-    match => "^LoadModule = ${module}",
-    line => "LoadModule = ${module} ${arg_str}"
+    path   => '/var/lib/znc/configs/znc.conf',
+    match  => "^LoadModule = ${module}",
+    line   => "LoadModule = ${module} ${arg_str}"
   }
 }
diff --git a/manifests/setup.pp b/manifests/setup.pp
index 4d2e33013483236b7926bba91bffc69c47569335..17715e06cfcdcb9d05195f02e6e4924d27150837 100644
--- a/manifests/setup.pp
+++ b/manifests/setup.pp
@@ -12,23 +12,23 @@ class irc_bouncer::setup {
     { ensure => installed, })
 
   file_line { 'saslauthd remove START=no':
-    path => '/etc/default/saslauthd',
-    line => 'START=no',
-    ensure => absent,
+    ensure  => absent,
+    path    => '/etc/default/saslauthd',
+    line    => 'START=no',
     require => Package['sasl2-bin'],
   }
 
   file_line { 'saslauthd START=yes':
-    path => '/etc/default/saslauthd',
-    line => 'START=yes',
-    ensure => present,
+    ensure  => present,
+    path    => '/etc/default/saslauthd',
+    line    => 'START=yes',
     require => Package['sasl2-bin'],
   }
 
   file_line { 'saslauthd pam':
-    path => '/etc/default/saslauthd',
-    line => 'MECHANISMS="pam"',
-    ensure => present,
+    ensure  => present,
+    path    => '/etc/default/saslauthd',
+    line    => 'MECHANISMS="pam"',
     require => Package['sasl2-bin'],
   }
 
@@ -37,35 +37,35 @@ class irc_bouncer::setup {
 
   user { 'znc':
     comment => 'ZNC Daemon runner',
-    home => '/var/lib/znc',
-    system => true,
-    shell => '/usr/sbin/nologin',
-    groups => [ 'sasl', ],
+    home    => '/var/lib/znc',
+    system  => true,
+    shell   => '/usr/sbin/nologin',
+    groups  => [ 'sasl', ],
   }
 
   file { '/var/lib/znc':
     ensure => directory,
-    owner => 'znc',
+    owner  => 'znc',
   }
   vcsrepo { '/var/lib/znc/znc-lysator':
-    ensure => latest,
+    ensure   => latest,
     provider => git,
-    source => 'https://git.lysator.liu.se/hugo/znc-lysator',
+    source   => 'https://git.lysator.liu.se/hugo/znc-lysator',
     revision => 'release',
   } ~> exec { 'build znc-lysator':
-    cwd => '/var/lib/znc/znc-lysator',
+    cwd     => '/var/lib/znc/znc-lysator',
     command => 'make',
-    path => '/usr/bin:/bin',
+    path    => '/usr/bin:/bin',
   } ~> file { '/usr/lib/znc/lysconf.so':
     ensure => present,
     source => '/var/lib/znc/znc-lysator/lysconf.so',
   }
 
   file { '/var/lib/znc/configs/znc.conf':
-    ensure => present,
+    ensure  => present,
     replace => no,
-    source => 'puppet:///modules/irc_bouncer/znc.conf',
-    owner => 'znc',
+    source  => 'puppet:///modules/irc_bouncer/znc.conf',
+    owner   => 'znc',
   }
 
   irc_bouncer::module { [ 'webadmin',
@@ -78,13 +78,13 @@ class irc_bouncer::setup {
 
   exec { 'znc make pem':
     command => 'znc --datadir=/var/lib/znc --makepem',
-    path => '/usr/bin:/bin',
-    user => 'znc',
-    onlyif => 'test ! -f /var/lib/znc/znc.pem',
+    path    => '/usr/bin:/bin',
+    user    => 'znc',
+    onlyif  => 'test ! -f /var/lib/znc/znc.pem',
   }
 
   file { '/var/lib/znc/moddata/cyrusauth/.registry':
-    ensure => file,
+    ensure  => file,
     content => "CreateUser true\n",
   }