diff --git a/module/VuFindAdmin/src/VuFindAdmin/Controller/AbstractAdmin.php b/module/VuFindAdmin/src/VuFindAdmin/Controller/AbstractAdmin.php
index d22a6274ecf6ef2785e80103237f66f5cfb11a89..b59aecb81fbc3c95f70385015da366a2345a0952 100644
--- a/module/VuFindAdmin/src/VuFindAdmin/Controller/AbstractAdmin.php
+++ b/module/VuFindAdmin/src/VuFindAdmin/Controller/AbstractAdmin.php
@@ -49,7 +49,7 @@ class AbstractAdmin extends \VuFind\Controller\AbstractBase
     }
 
     /**
-     * preDispatch -- block access when appropriate.
+     * Use preDispatch event to block access when appropriate.
      *
      * @param MvcEvent $e Event object
      *
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Backend.php b/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Backend.php
index 914d41396a4629f375809dad919aa885922996ec..284dd339e02d6a10e3488894930a00bec5a075d3 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Backend.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Backend.php
@@ -368,7 +368,6 @@ class Backend extends AbstractBackend
      * @param QueryBuilder $queryBuilder Query builder
      *
      * @return void
-     *
      */
     public function setQueryBuilder(QueryBuilder $queryBuilder)
     {
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/EIT/QueryBuilder.php b/module/VuFindSearch/src/VuFindSearch/Backend/EIT/QueryBuilder.php
index ac960b5f3ea34e2b1a3c6c4a68a377df06088679..61d4aedd0823ae81a4ab0cf735300de424b27880 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/EIT/QueryBuilder.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/EIT/QueryBuilder.php
@@ -54,7 +54,6 @@ class QueryBuilder
 
     /**
      * Constructor
-     *
      */
     public function __construct()
     {
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/LibGuides/Connector.php b/module/VuFindSearch/src/VuFindSearch/Backend/LibGuides/Connector.php
index dd1c5d9908a8f85a843f1e392c3ccc7b5e526971..e96c9b223c4c0e803747fd00021a5f1cd1de1a0a 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/LibGuides/Connector.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/LibGuides/Connector.php
@@ -133,7 +133,7 @@ class Connector implements \Zend\Log\LoggerAwareInterface
     }
 
     /**
-     * small wrapper for sendRequest, process to simplify error handling.
+     * Small wrapper for sendRequest, process to simplify error handling.
      *
      * @param string $qs     Query string
      * @param string $method HTTP method
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/Pazpar2/Response/Record.php b/module/VuFindSearch/src/VuFindSearch/Backend/Pazpar2/Response/Record.php
index 8c21f3931f6f82f8087a12e63f17d2b70e431c24..afa7240c6c33ebb70ac7be3f492c0390a4b6bf7f 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/Pazpar2/Response/Record.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/Pazpar2/Response/Record.php
@@ -91,7 +91,7 @@ class Record implements RecordInterface
     }
 
     /**
-     * getXML()
+     * Get the XML document representation
      *
      * @return SimpleXMLElement
      */
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/Primo/Connector.php b/module/VuFindSearch/src/VuFindSearch/Backend/Primo/Connector.php
index 99b12fdb1b8e1ceca4d9df15796249fba28629ea..0461f16e6e77dffe0af57c06a8a8212baa8dc07f 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/Primo/Connector.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/Primo/Connector.php
@@ -123,6 +123,7 @@ class Connector implements \Zend\Log\LoggerAwareInterface
      *
      * @throws \Exception
      * @return array             An array of query results
+     *
      * @link http://www.exlibrisgroup.org/display/PrimoOI/Brief+Search
      */
     public function query($institution, $terms, $params = null)
@@ -323,7 +324,7 @@ class Connector implements \Zend\Log\LoggerAwareInterface
     }
 
     /**
-     * small wrapper for sendRequest, process to simplify error handling.
+     * Small wrapper for sendRequest, process to simplify error handling.
      *
      * @param string $qs     Query string
      * @param string $method HTTP method
@@ -351,7 +352,7 @@ class Connector implements \Zend\Log\LoggerAwareInterface
     }
 
     /**
-     * translate Primo's XML into array of arrays.
+     * Translate Primo's XML into array of arrays.
      *
      * @param array $data The raw xml from Primo
      *
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/CommitDocument.php b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/CommitDocument.php
index 826ed5c91d4145177a1c50786dac4d8fc2f072d2..7ac36f8478b25853ab5f3eb98460bf95571ff30c 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/CommitDocument.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/CommitDocument.php
@@ -43,7 +43,7 @@ class CommitDocument extends AbstractDocument
 {
 
     /**
-     * commitWithin attribute value.
+     * Value for commitWithin attribute
      *
      * @var integer
      */
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/OptimizeDocument.php b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/OptimizeDocument.php
index fad3a73e23c9c293e90c9ebd59540394f2c6a355..c0a4b335afa6a46185c9146c11e93d1c637fef7a 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/OptimizeDocument.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/OptimizeDocument.php
@@ -43,14 +43,14 @@ class OptimizeDocument extends AbstractDocument
 {
 
     /**
-     * waitFlush attribute value
+     * Value for waitFlush attribute
      *
      * @var boolean
      */
     protected $waitFlush;
 
     /**
-     * waitSearch attribute value.
+     * Value for waitSearch attribute
      *
      * @var boolean
      */
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/QueryBuilder.php b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/QueryBuilder.php
index a66804066ccd843399e41845a271d6f08ecb9c1a..91ad49e8855827f0d2d5ede56fa588232c50ad28 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/QueryBuilder.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/QueryBuilder.php
@@ -301,7 +301,6 @@ class QueryBuilder implements QueryBuilderInterface
      * @return string
      *
      * @see self::reduceQueryGroup()
-     *
      */
     protected function reduceQueryGroupComponents(AbstractQuery $component)
     {
@@ -335,7 +334,6 @@ class QueryBuilder implements QueryBuilderInterface
      * @param SearchHandler $handler Search handler
      *
      * @return string
-     *
      */
     protected function createSearchString($string, SearchHandler $handler = null)
     {
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Response/Json/NamedList.php b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Response/Json/NamedList.php
index 76e381562055533629f5ee5b84b4b2a2d67fd939..5abb2801544c1b4e784cde98e20eaed7db783b09 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Response/Json/NamedList.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Response/Json/NamedList.php
@@ -42,7 +42,6 @@ use Countable, Iterator;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org
  * @see      http://wiki.apache.org/solr/SolJSON
- *
  */
 class NamedList implements Countable, Iterator
 {
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Response/Json/Spellcheck.php b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Response/Json/Spellcheck.php
index 174e7c1d5d294500313a1cd1e1936fa2c45288a9..1659bf87b311fb21945c98f1426445ea6b5f2d97 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Response/Json/Spellcheck.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Response/Json/Spellcheck.php
@@ -194,7 +194,7 @@ class Spellcheck implements IteratorAggregate, Countable
      *
      * @return integer
      *
-     * @see    http://www.php.net/manual/en/arrayobject.uksort.php
+     * @see http://www.php.net/manual/en/arrayobject.uksort.php
      */
     public function compareTermLength($a, $b)
     {
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/SearchHandler.php b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/SearchHandler.php
index d9479420ca94c941a241c4348aadcabf8de35888..28f42a7e0a55f68a776699d8ce7f4e9b7c66d9d3 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/SearchHandler.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/SearchHandler.php
@@ -219,7 +219,6 @@ class SearchHandler
      * Return the filter query.
      *
      * @return string
-     *
      */
     public function getFilterQuery()
     {
@@ -358,7 +357,6 @@ class SearchHandler
      * @param bool   $advanced Is the search an advanced search string?
      *
      * @return string
-     *
      */
     protected function createQueryString($search, $advanced = false)
     {
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/WorldCat/Response/XML/Record.php b/module/VuFindSearch/src/VuFindSearch/Backend/WorldCat/Response/XML/Record.php
index e5d451696be33500ff62bc9b70a5ac2fbe35b6fb..b4cfc177f412acbf87df2629a93a131708a3cb26 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/WorldCat/Response/XML/Record.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/WorldCat/Response/XML/Record.php
@@ -91,7 +91,7 @@ class Record implements RecordInterface
     }
 
     /**
-     * getMarc()
+     * Get MARC record
      *
      * @return File_MARC_Record
      */