diff --git a/module/VuFind/src/VuFind/Cache/Manager.php b/module/VuFind/src/VuFind/Cache/Manager.php
index 091dfc36e0a1179f3d47c3cb24734cbf0f39136a..665619f74a941802c9e74097c1554c7975725ff1 100644
--- a/module/VuFind/src/VuFind/Cache/Manager.php
+++ b/module/VuFind/src/VuFind/Cache/Manager.php
@@ -127,8 +127,8 @@ class Manager
     /**
      * Add a file cache to the manager and ensure that necessary directory exists.
      *
-     * @param string $cacheName    Name of new cache to create
-     * @param string $dirName      Directory to use for storage
+     * @param string $cacheName Name of new cache to create
+     * @param string $dirName   Directory to use for storage
      *
      * @return void
      */
@@ -151,7 +151,7 @@ class Manager
     /**
      * Add an APC cache to the manager.
      *
-     * @param string $cacheName    Name of new cache to create
+     * @param string $cacheName Name of new cache to create
      *
      * @return void
      */
diff --git a/module/VuFind/src/VuFind/Mvc/View/InjectTemplateListener.php b/module/VuFind/src/VuFind/Mvc/View/InjectTemplateListener.php
index a6c81bedf1f92d809109d263f07ad96a01802846..e661e53012bee8ed764c6b9eecbe67372f6f08c9 100644
--- a/module/VuFind/src/VuFind/Mvc/View/InjectTemplateListener.php
+++ b/module/VuFind/src/VuFind/Mvc/View/InjectTemplateListener.php
@@ -42,7 +42,8 @@ class InjectTemplateListener extends \Zend\Mvc\View\InjectTemplateListener
     /**
      * Inflect a name to a normalized value
      *
-     * @param  string $name
+     * @param string $name Name to inflect
+     *
      * @return string
      */
     protected function inflectName($name)
@@ -55,7 +56,8 @@ class InjectTemplateListener extends \Zend\Mvc\View\InjectTemplateListener
     /**
      * Determine the top-level namespace of the controller
      * 
-     * @param  string $controller 
+     * @param string $controller Controller name
+     *
      * @return string
      */
     protected function deriveModuleNamespace($controller)
diff --git a/module/VuFind/src/VuFind/Theme/Initializer.php b/module/VuFind/src/VuFind/Theme/Initializer.php
index ca0f1c81c30fe7b4b23967839de1621d00b60d4d..5f218c81754fd4ab1a035d3c028c3c420ee7ac2d 100644
--- a/module/VuFind/src/VuFind/Theme/Initializer.php
+++ b/module/VuFind/src/VuFind/Theme/Initializer.php
@@ -85,6 +85,8 @@ class Initializer
      * This needs to be called prior to the dispatch event, which is why it is a
      * separate static method rather than part of the init() method below.
      *
+     * @param MvcEvent $event Dispatch event object
+     *
      * @return void
      */
     public static function configureTemplateInjection(MvcEvent $event)
@@ -180,9 +182,11 @@ class Initializer
             $allThemeInfo = array();
             do {
                 $iniReader = new IniReader();
-                $currentThemeInfo = new Config($iniReader->fromFile(
-                    $this->baseDir . "/$currentTheme/theme.ini"
-                ));
+                $currentThemeInfo = new Config(
+                    $iniReader->fromFile(
+                        $this->baseDir . "/$currentTheme/theme.ini"
+                    )
+                );
 
                 $allThemeInfo[$currentTheme] = $currentThemeInfo;
 
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/OfflineMode.php b/module/VuFind/src/VuFind/Theme/Root/Helper/OfflineMode.php
index d9dce6ade2502c0025d2b5c52c96b00c54373f01..e6a11627e5ea5fa49fa852ef20bb714046b08b2b 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/OfflineMode.php
+++ b/module/VuFind/src/VuFind/Theme/Root/Helper/OfflineMode.php
@@ -42,8 +42,6 @@ class OfflineMode extends AbstractHelper
     /**
      * Wrapper function to the VF_Search_Options getInstance function
      *
-     * @param string $type The search type of the object to retrieve
-     *
      * @return SearchOptions
      */
     public function __invoke()