diff --git a/captcha.module b/captcha.module
index 8634393..b43bf29 100755
--- a/captcha.module
+++ b/captcha.module
@@ -74,6 +74,7 @@ function captcha_help($route_name, RouteMatchInterface $route_match) {
  *   Form id string.
  *
  * @return \Drupal\Core\Entity\EntityInterface
+ *   An instance of an captcha_point entity.
  */
 function captcha_point_load($id) {
   return CaptchaPoint::load($id);
@@ -203,8 +204,6 @@ function captcha_form_alter(array &$form, FormStateInterface $form_state, $form_
             'query' => Drupal::destination()
               ->getAsArray(),
           ]),
-          // '@disable' => $captcha_point->url('disable', ['query' => Drupal::destination()->getAsArray()]),
-          // '@enable' => $captcha_point->url('enable', ['query' => Drupal::destination()->getAsArray()]),
         ]),
       ];
     }
@@ -215,7 +214,7 @@ function captcha_form_alter(array &$form, FormStateInterface $form_state, $form_
           t('Place a CAPTCHA here for untrusted users.'),
           Url::fromRoute('captcha_point.add', [], [
             'query' => Drupal::destination()
-                ->getAsArray() + ['form_id' => $form_id],
+              ->getAsArray() + ['form_id' => $form_id],
           ])
         )->toString(),
       ];
@@ -313,7 +312,7 @@ function captcha_validate_case_insensitive_ignore_spaces($solution, $response) {
  *
  * @param array $element
  *   The CAPTCHA element.
- * @param array $form_state
+ * @param FormStateInterface $form_state
  *   The form state structure to extract the info from.
  * @param string $this_form_id
  *   The form ID of the form we are currently processing
diff --git a/image_captcha/image_captcha.module b/image_captcha/image_captcha.module
index dc46c44..703115d 100755
--- a/image_captcha/image_captcha.module
+++ b/image_captcha/image_captcha.module
@@ -166,6 +166,7 @@ function _image_captcha_check_setup($check_fonts = TRUE) {
  * They are based on given code and current font/spacing settings.
  *
  * @param string $code
+ *   The utf8 string which will be used to split in characters.
  *
  * @return array
  *   Array($width, $heigh).
@@ -177,7 +178,7 @@ function _image_captcha_image_size($code) {
   $characters = _image_captcha_utf8_split($code);
   $character_quantity = count($characters);
 
-  // Calculate height and width
+  // Calculate height and width.
   $width = $character_spacing * $font_size * $character_quantity;
   $height = 2 * $font_size;
 
diff --git a/src/Tests/CaptchaBaseWebTestCase.php b/src/Tests/CaptchaBaseWebTestCase.php
index 48f980a..c2984f2 100755
--- a/src/Tests/CaptchaBaseWebTestCase.php
+++ b/src/Tests/CaptchaBaseWebTestCase.php
@@ -1,13 +1,5 @@
 <?php
 
-// TODO: write test for CAPTCHAs on admin pages
-// TODO: test for default challenge type
-// TODO: test about placement (comment form, node forms, log in form, etc)
-// TODO: test if captcha_cron does it work right
-// TODO: test custom CAPTCHA validation stuff
-// TODO: test if entry on status report (Already X blocked form submissions)
-// TODO: test space ignoring validation of image CAPTCHA
-// TODO: refactor the 'comment_body[0][value]' stuff.
 namespace Drupal\captcha\Tests;
 
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
@@ -16,6 +8,17 @@ use Drupal\field\Entity\FieldConfig;
 use Drupal\simpletest\WebTestBase;
 
 /**
+ * TODO: write test for CAPTCHAs on admin pages
+ * TODO: test for default challenge type
+ * TODO: test about placement (comment form, node forms, log in form, etc)
+ * TODO: test if captcha_cron does it work right
+ * TODO: test custom CAPTCHA validation stuff
+ * TODO: test if entry on status report (Already X blocked form submissions)
+ * TODO: test space ignoring validation of image CAPTCHA
+ * TODO: refactor the 'comment_body[0][value]' stuff.
+ */
+
+/**
  * Base class for CAPTCHA tests.
  *
  * Provides common setup stuff and various helper functions.