diff --git a/modules/mediawiki/manifests/app.pp b/modules/mediawiki/manifests/app.pp
index ea3ed1395a..0365fcd493 100644
--- a/modules/mediawiki/manifests/app.pp
+++ b/modules/mediawiki/manifests/app.pp
@@ -1,9 +1,12 @@
+# Class: mediawiki::app
+#
 class mediawiki::app {
-
-  vcsrepo { "/srv/mediawiki/w":
-    ensure => latest,
+  vcsrepo { '/srv/mediawiki/w':
+    ensure   => latest,
     provider => git,
-    source => "https://gerrit.wikimedia.org/r/p/mediawiki/core.git",
-    revision => "origin/master",
+    source   => 'https://gerrit.wikimedia.org/r/p/mediawiki/core.git',
+    revision => 'origin/master',
   }
 }
+
+# vim:sw=2:ts=2:expandtab:textwidth=79
diff --git a/modules/mediawiki/manifests/image_scaler.pp b/modules/mediawiki/manifests/image_scaler.pp
index 87f302e05b..6b0d18e883 100644
--- a/modules/mediawiki/manifests/image_scaler.pp
+++ b/modules/mediawiki/manifests/image_scaler.pp
@@ -1,3 +1,5 @@
+# Class: mediawiki::image_scaler
+#
 class mediawiki::image_scaler {
   package { [ 'djvulibre-bin',
     'ffmpeg',
@@ -52,7 +54,7 @@ class mediawiki::image_scaler {
     'xfonts-base',
     'xfonts-mplus',
     'xfonts-scalable']:
-    ensure => present;
+    ensure => present,
   }
   include tmpreaper
 }
diff --git a/modules/mediawiki/manifests/init.pp b/modules/mediawiki/manifests/init.pp
index 3ff1d18a02..588ed6a96c 100644
--- a/modules/mediawiki/manifests/init.pp
+++ b/modules/mediawiki/manifests/init.pp
@@ -1,12 +1,18 @@
-class mediawiki($role, $site_hostname, $mediawiki_location='') {
+# Class: mediawiki
+#
+class mediawiki(
+  $role,
+  $site_hostname,
+  $mediawiki_location = ''
+) {
   if ($role == 'app' or $role == 'all') {
-    include apache
     require apache::dev
-    include mediawiki::php,
-            mediawiki::app
+    include apache
+    include mediawiki::php
+    include mediawiki::app
 
     package { 'libapache2-mod-php5':
-      ensure => present
+      ensure => present,
     }
 
     apache::vhost { $site_hostname:
@@ -17,19 +23,17 @@ class mediawiki($role, $site_hostname, $mediawiki_location='') {
       ssl      => true,
     }
     a2mod { 'rewrite':
-      ensure => present
+      ensure => present,
     }
     a2mod { 'expires':
-      ensure => present
+      ensure => present,
     }
-
   }
   if ($role == 'image-scaler' or $role == 'all') {
-    include mediawiki::image_scaler,
-            mediawiki::php,
-            mediawiki::app
-  }
-  if ($role == 'search' or $role == 'all') {
-    include mediawiki::search
+    include mediawiki::image_scaler
+    include mediawiki::php
+    include mediawiki::app
   }
 }
+
+# vim:sw=2:ts=2:expandtab:textwidth=79
diff --git a/modules/mediawiki/manifests/php.pp b/modules/mediawiki/manifests/php.pp
index ee1821bcf3..2c0c62a2c1 100644
--- a/modules/mediawiki/manifests/php.pp
+++ b/modules/mediawiki/manifests/php.pp
@@ -1,3 +1,5 @@
+# Class: mediawiki::php
+#
 class mediawiki::php {
   package { ['php5', 'php5-cli', 'php5-mysql', 'php-apc', 'php5-intl']:
     ensure => present,
diff --git a/modules/mediawiki/manifests/search.pp b/modules/mediawiki/manifests/search.pp
deleted file mode 100644
index ca21aeddc1..0000000000
--- a/modules/mediawiki/manifests/search.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class mediawiki::search {
-  # Not currently defined. We should add lucene.
-}