diff --git a/poll.module b/poll.module
index e8dbd4f..62dd596 100644
--- a/poll.module
+++ b/poll.module
@@ -105,6 +105,10 @@ function poll_cron() {
 
 /**
  * Implements template_preprocess_HOOK() for poll-vote.html.twig.
+ *
+ * @param array $variables
+ *   An associative array containing:
+ *   - form: The renderable form array for the poll voting form.
  */
 function template_preprocess_poll_vote(&$variables) {
   $form = $variables['form'];
@@ -127,6 +131,7 @@ function template_preprocess_poll_vote(&$variables) {
  *   An associative array containing:
  *   - display_value: The textual representation of the meter bar.
  *   - form: A string specifying one or more forms to which the <meter> element
+ *     belongs; multiple forms separated by spaces.
  *   - attributes: Associative array of attributes to be placed in the meter
  *     tag.
  */
@@ -156,7 +161,7 @@ function template_preprocess_poll_meter(&$variables) {
 /**
  * Implements template_preprocess_HOOK() for poll-results.html.twig.
  *
- * @param $variables
+ * @param array $variables
  *   An associative array containing:
  *   - raw_title: A string for the title of the poll.
  *   - results: The results of the poll.
diff --git a/src/Entity/Poll.php b/src/Entity/Poll.php
index d7c2e99..2131bad 100644
--- a/src/Entity/Poll.php
+++ b/src/Entity/Poll.php
@@ -384,9 +384,7 @@ class Poll extends ContentEntityBase implements PollInterface {
   }
 
   /**
-   * Get all options for this poll.
-   *
-   * @return array
+   * {@inheritdoc}
    */
   public function getOptions() {
     $options = array();
@@ -399,9 +397,7 @@ class Poll extends ContentEntityBase implements PollInterface {
   }
 
   /**
-   * Get the values of each vote option for this poll.
-   *
-   * @return array
+   * {@inheritdoc}
    */
   public function getOptionValues() {
     $options = array();
diff --git a/src/Form/PollForm.php b/src/Form/PollForm.php
index c3d3b96..205c05c 100644
--- a/src/Form/PollForm.php
+++ b/src/Form/PollForm.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\poll\PollFormController.
+ * Contains \Drupal\poll\Form\PollForm.
  */
 
 namespace Drupal\poll\Form;
diff --git a/src/Form/PollViewForm.php b/src/Form/PollViewForm.php
index 420d57b..0f02d83 100644
--- a/src/Form/PollViewForm.php
+++ b/src/Form/PollViewForm.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\ban\Form\BanAdmin.
+ * Contains \Drupal\poll\Form\PollViewForm.
  */
 
 namespace Drupal\poll\Form;
@@ -23,7 +23,7 @@ class PollViewForm extends FormBase {
   /**
    * The Poll of the form.
    *
-   * @var PollInterface
+   * @var \Drupal\poll\PollInterface
    */
   protected $poll;
 
@@ -38,7 +38,7 @@ class PollViewForm extends FormBase {
    * Set the Poll of this form.
    *
    * @param \Drupal\poll\PollInterface $poll
-   *    The poll that will be set in the form.
+   *   The poll that will be set in the form.
    */
   public function setPoll(PollInterface $poll) {
     $this->poll = $poll;
@@ -210,9 +210,12 @@ class PollViewForm extends FormBase {
    * Display a themed poll results.
    *
    * @param \Drupal\poll\PollInterface $poll
+   *   The poll entity.
    * @param bool $block
+   *   (optional) TRUE if a poll should be displayed in a block. Defaults to
+   *   FALSE.
    *
-   * @return false|string
+   * @return array $output
    */
   function showPollResults(PollInterface $poll, $block = FALSE) {
 
@@ -288,7 +291,7 @@ class PollViewForm extends FormBase {
    * View vote results submit function.
    *
    * @param array $form
-   * @param array $form_state
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
    */
   public function result(array $form, FormStateInterface $form_state) {
     $form_state->set('show_results', TRUE);
@@ -299,7 +302,7 @@ class PollViewForm extends FormBase {
    * Back to poll view submit function.
    *
    * @param array $form
-   * @param array $form_state
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
    */
   public function back(array $form, FormStateInterface $form_state) {
     $form_state->set('show_results', FALSE);
@@ -310,7 +313,7 @@ class PollViewForm extends FormBase {
    * Save a user's vote submit function.
    *
    * @param array $form
-   * @param array $form_state
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
    */
   public function save(array $form, FormStateInterface $form_state) {
     $options = array();
@@ -346,6 +349,9 @@ class PollViewForm extends FormBase {
 
   /**
    * Validates the vote action.
+   *
+   * @param array $form
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
    */
   public function validateVote(array &$form, FormStateInterface $form_state) {
     if (!$form_state->hasValue('choice')) {
@@ -355,10 +361,11 @@ class PollViewForm extends FormBase {
 
   /**
    * Checks if the current user is allowed to cancel on the given poll.
+   *
    * @param \Drupal\poll\PollInterface $poll
    *
    * @return bool
-   *   TRUE if the user can can cancel.
+   *   TRUE if the user can cancel.
    */
   protected function isCancelAllowed(PollInterface $poll) {
     // Allow access if the user has voted.
diff --git a/src/Plugin/Block/PollRecentBlock.php b/src/Plugin/Block/PollRecentBlock.php
index c3fdc9a..e34b779 100644
--- a/src/Plugin/Block/PollRecentBlock.php
+++ b/src/Plugin/Block/PollRecentBlock.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\poll\Plugin\block\block\PollRecentBlock.
+ * Contains \Drupal\poll\Plugin\Block\PollRecentBlock.
  */
 
 namespace Drupal\poll\Plugin\Block;
diff --git a/src/Plugin/Field/FieldWidget/PollChoiceDefaultWidget.php b/src/Plugin/Field/FieldWidget/PollChoiceDefaultWidget.php
index 3121dd1..d0c7e82 100644
--- a/src/Plugin/Field/FieldWidget/PollChoiceDefaultWidget.php
+++ b/src/Plugin/Field/FieldWidget/PollChoiceDefaultWidget.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\poll\Plugin\field\FieldWidget\PollChoiceDefaultWidget.
+ * Contains \Drupal\poll\Plugin\Field\FieldWidget\PollChoiceDefaultWidget.
  */
 
 namespace Drupal\poll\Plugin\Field\FieldWidget;
diff --git a/src/Plugin/views/field/PollStatus.php b/src/Plugin/views/field/PollStatus.php
index a0ed4c7..12b20aa 100644
--- a/src/Plugin/views/field/PollStatus.php
+++ b/src/Plugin/views/field/PollStatus.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\poll\views\field\PollStatus.
+ * Contains \Drupal\poll\Plugin\views\field\PollStatus.
  */
 
 namespace Drupal\poll\Plugin\views\field;
diff --git a/src/Plugin/views/field/PollTotalVotes.php b/src/Plugin/views/field/PollTotalVotes.php
index 5a270b0..ed01559 100644
--- a/src/Plugin/views/field/PollTotalVotes.php
+++ b/src/Plugin/views/field/PollTotalVotes.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\poll\views\field\PollTotalVotes.
+ * Contains \Drupal\poll\Plugin\views\field\PollTotalVotes.
  */
 
 namespace Drupal\poll\Plugin\views\field;
diff --git a/src/PollChoiceInterface.php b/src/PollChoiceInterface.php
index 4419ee0..02b8551 100644
--- a/src/PollChoiceInterface.php
+++ b/src/PollChoiceInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\poll\Entity\PollChoiceInterface.
+ * Contains \Drupal\poll\PollChoiceInterface.
  */
 
 namespace Drupal\poll;
diff --git a/src/PollInterface.php b/src/PollInterface.php
index f6a8531..29fa91d 100644
--- a/src/PollInterface.php
+++ b/src/PollInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\poll\Entity\PollInterface.
+ * Contains \Drupal\poll\PollInterface.
  */
 
 namespace Drupal\poll;
@@ -46,7 +46,7 @@ interface PollInterface extends ContentEntityInterface {
 
 
   /**
-   * Returns the runtimeof the feed in seconds.
+   * Returns the runtime of the feed in seconds.
    *
    * @return int
    *   The refresh rate of the feed in seconds.
@@ -56,7 +56,7 @@ interface PollInterface extends ContentEntityInterface {
   /**
    * Sets the runtime of the feed in seconds.
    *
-   * @param int $refresh
+   * @param int $runtime
    *   The refresh rate of the feed in seconds.
    *
    * @return \Drupal\poll\PollInterface
@@ -76,7 +76,7 @@ interface PollInterface extends ContentEntityInterface {
   /**
    * Sets the time when this feed was queued for refresh, 0 if not queued.
    *
-   * @param int $checked
+   * @param int $anonymous_vote_allow
    *   The timestamp of the last refresh.
    *
    * @return \Drupal\poll\PollInterface
@@ -95,7 +95,7 @@ interface PollInterface extends ContentEntityInterface {
   /**
    * Sets the time when this feed was queued for refresh, 0 if not queued.
    *
-   * @param int $queued
+   * @param int $cancel_vote_allow
    *   The timestamp of the last refresh.
    *
    * @return \Drupal\poll\PollInterface
@@ -115,7 +115,7 @@ interface PollInterface extends ContentEntityInterface {
   /**
    * Sets the time when this feed was queued for refresh, 0 if not queued.
    *
-   * @param int $queued
+   * @param int $result_vote_allow
    *   The timestamp of the last refresh.
    *
    * @return \Drupal\poll\PollInterface
@@ -160,6 +160,7 @@ interface PollInterface extends ContentEntityInterface {
    * Get all options for this poll.
    *
    * @return array
+   *   Associative array of option keys and values.
    */
   public function getOptions();
 
@@ -167,6 +168,7 @@ interface PollInterface extends ContentEntityInterface {
    * Get the values of each vote option for this poll.
    *
    * @return array
+   *   Associative array of option values.
    */
   public function getOptionValues();
 
diff --git a/src/PollListBuilder.php b/src/PollListBuilder.php
index f6a436b..e8c6ef0 100644
--- a/src/PollListBuilder.php
+++ b/src/PollListBuilder.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Definition of Drupal\poll\PollListController.
+ * Contains \Drupal\poll\PollListBuilder.
  */
 
 namespace Drupal\poll;
diff --git a/src/PollViewBuilder.php b/src/PollViewBuilder.php
index 374348d..c81d118 100644
--- a/src/PollViewBuilder.php
+++ b/src/PollViewBuilder.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\aggregator\FeedViewBuilder.
+ * Contains \Drupal\poll\PollViewBuilder.
  */
 
 namespace Drupal\poll;
diff --git a/src/Tests/PollBlockTest.php b/src/Tests/PollBlockTest.php
index 7a5a939..e8ca6b9 100644
--- a/src/Tests/PollBlockTest.php
+++ b/src/Tests/PollBlockTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\poll\Tests\PollBlockTest.
+ * Contains \Drupal\poll\Tests\PollBlockTest.
  */
 
 namespace Drupal\poll\Tests;
diff --git a/src/Tests/PollCreateTest.php b/src/Tests/PollCreateTest.php
index e033f62..57f1efa 100644
--- a/src/Tests/PollCreateTest.php
+++ b/src/Tests/PollCreateTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\poll\Tests\PollCreateTest.
+ * Contains \Drupal\poll\Tests\PollCreateTest.
  */
 
 namespace Drupal\poll\Tests;
diff --git a/src/Tests/PollDeleteChoiceTest.php b/src/Tests/PollDeleteChoiceTest.php
index 4121b03..a49851f 100644
--- a/src/Tests/PollDeleteChoiceTest.php
+++ b/src/Tests/PollDeleteChoiceTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\poll\Tests\PollDeleteChoiceTest.
+ * Contains \Drupal\poll\Tests\PollDeleteChoiceTest.
  */
 
 namespace Drupal\poll\Tests;
diff --git a/src/Tests/PollExpirationTest.php b/src/Tests/PollExpirationTest.php
index ca25da4..5dc46ca 100644
--- a/src/Tests/PollExpirationTest.php
+++ b/src/Tests/PollExpirationTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\poll\Tests\PollExpirationTest.
+ * Contains \Drupal\poll\Tests\PollExpirationTest.
  */
 
 namespace Drupal\poll\Tests;
diff --git a/src/Tests/PollTestBase.php b/src/Tests/PollTestBase.php
index 169324c..51e33cb 100644
--- a/src/Tests/PollTestBase.php
+++ b/src/Tests/PollTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\poll\Tests\PollTestBase.
+ * Contains \Drupal\poll\Tests\PollTestBase.
  */
 
 namespace Drupal\poll\Tests;
@@ -76,15 +76,13 @@ abstract class PollTestBase extends WebTestBase {
   /**
    * Creates a poll.
    *
-   * @param string $title
-   *   The title of the poll.
-   * @param array $choices
-   *   A list of choice labels.
+   * @param int $choice_count
+   *   (optional) The number of choices to generate. Defaults to 7.
    * @param boolean $preview
    *   (optional) Whether to test if the preview is working or not. Defaults to
    *   TRUE.
    *
-   * @return
+   * @return mixed
    *   The node id of the created poll, or FALSE on error.
    */
   function pollCreate($choice_count = 7, $preview = TRUE) {
@@ -128,16 +126,16 @@ abstract class PollTestBase extends WebTestBase {
   /**
    * Generates POST values for the poll node form, specifically poll choices.
    *
-   * @param $title
-   *   The title for the poll node.
-   * @param $choices
+   * @param string $question
+   *   The poll question.
+   * @param array $choices
    *   An array containing poll choices, as generated by
    *   PollTestBase::generateChoices().
-   * @param $index
+   * @param int $index
    *   (optional) The amount/number of already submitted poll choices. Defaults
    *   to 0.
    *
-   * @return
+   * @return array
    *   An indexed array containing:
    *   - The generated POST values, suitable for
    *     Drupal\simpletest\WebTestBase::drupalPostForm().
@@ -161,8 +159,14 @@ abstract class PollTestBase extends WebTestBase {
     return array($edit, count($already_submitted_choices) + count($new_choices));
   }
 
-  /*
+  /**
    * Generates random choices for the poll.
+   *
+   * @param int $count
+   *   (optional) The number of choices to generate. Defaults to 7.
+   *
+   * @return array $choices
+   *   An array of generated choices.
    */
   private function generateChoices($count = 7) {
     $choices = array();
@@ -177,14 +181,14 @@ abstract class PollTestBase extends WebTestBase {
    *
    * Verifies both the order in the DOM and in the 'weight' form elements.
    *
-   * @param $choices
+   * @param array $choices
    *   An array containing poll choices, as generated by
    *   PollTestBase::generateChoices().
-   * @param $index
+   * @param int $index
    *   (optional) The amount/number of already submitted poll choices. Defaults
    *   to 0.
-   * @param $preview
-   *   (optional) Whether to also check the poll preview.
+   * @param bool $preview
+   *   (optional) Whether to also check the poll preview. Defaults to FALSE.
    *
    * @see PollTestBase::pollGenerateEdit()
    */
@@ -237,15 +241,15 @@ abstract class PollTestBase extends WebTestBase {
    * Get the Choice ID of a poll.
    *
    * @param \Drupal\poll\PollInterface $poll
-   *    The poll of the choice.
+   *   The poll of the choice.
    * @param int $delta
-   *    The number of the choice.
+   *   The number of the choice.
    *
-   * @return int
-   *    Returns the choice chid or an error.
+   * @return int $key
+   *   Returns the choice ID or an error.
    *
    * @throws InvalidArgumentException
-   *    Throws it if the poll does not have the choice delta.
+   *   Throws it if the poll does not have the choice delta.
    */
   protected function getChoiceId(PollInterface $poll, $delta) {
     $options = $poll->getOptions();
@@ -262,15 +266,15 @@ abstract class PollTestBase extends WebTestBase {
    * Get the Choice ID of a poll from the label.
    *
    * @param \Drupal\poll\PollInterface $poll
-   *    The poll of the choice.
+   *   The poll of the choice.
    * @param string $label
-   *    The label of the choice.
+   *   The label of the choice.
    *
-   * @return int
-   *    Returns the choice id or an error.
+   * @return int $id
+   *   Returns the choice id or an error.
    *
    * @throws InvalidArgumentException
-   *    Throws it if the poll does not have the choice label.
+   *   Throws it if the poll does not have the choice label.
    */
   protected function getChoiceIdByLabel(PollInterface $poll, $label) {
     $options = $poll->getOptions();
diff --git a/src/Tests/PollTokenReplaceTest.php b/src/Tests/PollTokenReplaceTest.php
index c53417e..5b22cae 100644
--- a/src/Tests/PollTokenReplaceTest.php
+++ b/src/Tests/PollTokenReplaceTest.php
@@ -2,10 +2,11 @@
 
 /**
  * @file
- * Definition of Drupal\poll\Tests\PollTokenReplaceTest.
+ * Contains \Drupal\poll\Tests\PollTokenReplaceTest.
  */
 
 namespace Drupal\poll\Tests;
+
 use Drupal\Component\Utility\Xss;
 use Drupal\poll\Entity\Poll;
 
@@ -58,7 +59,7 @@ class PollTokenReplaceTest extends PollTestBase {
     $this->drupalPostForm('poll/' . $poll_nid, $edit, t('Vote'));
     $this->drupalLogout();
 
-    /** @var Poll $poll */
+    /** @var \Drupal\poll\Entity\Poll $poll */
     $poll = Poll::load($poll_nid);
 
     // Generate and test sanitized tokens.
diff --git a/src/Tests/PollViewTest.php b/src/Tests/PollViewTest.php
index fb37510..2099731 100644
--- a/src/Tests/PollViewTest.php
+++ b/src/Tests/PollViewTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\poll\Tests\PollViewTest.
+ * Contains \Drupal\poll\Tests\PollViewTest.
  */
 
 namespace Drupal\poll\Tests;
diff --git a/src/Tests/PollVoteCheckHostnameTest.php b/src/Tests/PollVoteCheckHostnameTest.php
index 0dbcb39..4318097 100644
--- a/src/Tests/PollVoteCheckHostnameTest.php
+++ b/src/Tests/PollVoteCheckHostnameTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\poll\Tests\PollVoteCheckHostnameTest.
+ * Contains \Drupal\poll\Tests\PollVoteCheckHostnameTest.
  */
 
 namespace Drupal\poll\Tests;
diff --git a/src/Tests/PollVoteMultilingualTest.php b/src/Tests/PollVoteMultilingualTest.php
index 47c1b19..9574838 100644
--- a/src/Tests/PollVoteMultilingualTest.php
+++ b/src/Tests/PollVoteMultilingualTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\poll\Tests\PollVoteMultilingualTest.
+ * Contains \Drupal\poll\Tests\PollVoteMultilingualTest.
  */
 
 namespace Drupal\poll\Tests;
diff --git a/src/Tests/PollVoteTest.php b/src/Tests/PollVoteTest.php
index 952de1b..a8ece64 100644
--- a/src/Tests/PollVoteTest.php
+++ b/src/Tests/PollVoteTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\poll\Tests\PollVoteTest.
+ * Contains \Drupal\poll\Tests\PollVoteTest.
  */
 
 namespace Drupal\poll\Tests;