diff --git a/composer.json b/composer.json
index 90cc400..8ceea71 100644
--- a/composer.json
+++ b/composer.json
@@ -10,5 +10,7 @@
     "issues": "http://drupal.org/project/issues/votingapi",
     "source": "http://cgit.drupalcode.org/votingapi"
   },
-  "require": { }
+  "require": {
+    "drupal/votingapi": "8.x-3.0-alpha1"
+  } 
 }
diff --git a/src/Annotation/VoteResultFunction.php b/src/Annotation/VoteResultFunction.php
index 64303cd..406180c 100644
--- a/src/Annotation/VoteResultFunction.php
+++ b/src/Annotation/VoteResultFunction.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\votingapi\Annotation\VoteResultFunction.
- */
-
 namespace Drupal\votingapi\Annotation;
 
 use Drupal\Component\Annotation\Plugin;
diff --git a/src/Entity/Vote.php b/src/Entity/Vote.php
index 7e8ea06..de69c55 100644
--- a/src/Entity/Vote.php
+++ b/src/Entity/Vote.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains Drupal\votingapi\Entity\Vote.
- */
-
 namespace Drupal\votingapi\Entity;
 
 use Drupal\Core\Cache\Cache;
diff --git a/src/Entity/VoteResult.php b/src/Entity/VoteResult.php
index f418d95..becc42b 100644
--- a/src/Entity/VoteResult.php
+++ b/src/Entity/VoteResult.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains Drupal\votingapi\Entity\VoteResult.
- */
-
 namespace Drupal\votingapi\Entity;
 
 use Drupal\Core\Field\BaseFieldDefinition;
diff --git a/src/Entity/VoteType.php b/src/Entity/VoteType.php
index fa8be04..9633edd 100644
--- a/src/Entity/VoteType.php
+++ b/src/Entity/VoteType.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\votingapi\Entity\VoteType.
- */
-
 namespace Drupal\votingapi\Entity;
 
 use Drupal\Core\Config\Entity\ConfigEntityBundleBase;
diff --git a/src/Entity/VoteViewsData.php b/src/Entity/VoteViewsData.php
index a0dfa07..61e8e24 100644
--- a/src/Entity/VoteViewsData.php
+++ b/src/Entity/VoteViewsData.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains Drupal\votingapi\Entity\Vote.
- */
-
 namespace Drupal\votingapi\Entity;
 
 use Drupal\views\EntityViewsData;
diff --git a/src/Form/SettingsForm.php b/src/Form/SettingsForm.php
index 94f9172..6ad3edc 100644
--- a/src/Form/SettingsForm.php
+++ b/src/Form/SettingsForm.php
@@ -1,8 +1,6 @@
 <?php
 
 /**
- * @file
- * Contains Drupal\votingapi\Form\SettingsForm.
  * Configures administrative settings for VotingAPI.
  */
 
diff --git a/src/Form/VoteTypeDeleteConfirm.php b/src/Form/VoteTypeDeleteConfirm.php
index 211e54f..9a448d9 100644
--- a/src/Form/VoteTypeDeleteConfirm.php
+++ b/src/Form/VoteTypeDeleteConfirm.php
@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\node\Form\VoteTypeDeleteConfirm.
- */
 
 namespace Drupal\votingapi\Form;
 
diff --git a/src/Plugin/VoteResultFunction/Average.php b/src/Plugin/VoteResultFunction/Average.php
index 0ddd68f..454a8d6 100644
--- a/src/Plugin/VoteResultFunction/Average.php
+++ b/src/Plugin/VoteResultFunction/Average.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\votingapi\Plugin\VoteResultFunction\Average.
- */
-
 namespace Drupal\votingapi\Plugin\VoteResultFunction;
 
 use Drupal\votingapi\VoteResultFunctionBase;
diff --git a/src/Plugin/VoteResultFunction/Count.php b/src/Plugin/VoteResultFunction/Count.php
index 6341085..a015820 100644
--- a/src/Plugin/VoteResultFunction/Count.php
+++ b/src/Plugin/VoteResultFunction/Count.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\votingapi\Plugin\VoteResultFunction\Count.
- */
-
 namespace Drupal\votingapi\Plugin\VoteResultFunction;
 
 use Drupal\votingapi\VoteResultFunctionBase;
diff --git a/src/Plugin/VoteResultFunction/Sum.php b/src/Plugin/VoteResultFunction/Sum.php
index 172ab48..a655710 100644
--- a/src/Plugin/VoteResultFunction/Sum.php
+++ b/src/Plugin/VoteResultFunction/Sum.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\votingapi\Plugin\VoteResultFunction\Sum.
- */
-
 namespace Drupal\votingapi\Plugin\VoteResultFunction;
 
 use Drupal\votingapi\VoteResultFunctionBase;
diff --git a/src/Tests/VoteCreationTest.php b/src/Tests/VoteCreationTest.php
index 8b8ab3d..d4b9946 100644
--- a/src/Tests/VoteCreationTest.php
+++ b/src/Tests/VoteCreationTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\votingapi\Tests\VoteCreationTest.
- */
-
 namespace Drupal\votingapi\Tests;
 
 use Drupal\node\Entity\Node;
diff --git a/src/Tests/VoteTest.php b/src/Tests/VoteTest.php
index 4141c60..ec130bf 100644
--- a/src/Tests/VoteTest.php
+++ b/src/Tests/VoteTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\votingapi\Tests\VoteTest.
- */
-
 namespace Drupal\votingapi\Tests;
 
 use Drupal\simpletest\WebTestBase;
diff --git a/src/VoteInterface.php b/src/VoteInterface.php
index b70b04f..20aaced 100644
--- a/src/VoteInterface.php
+++ b/src/VoteInterface.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\votingapi\VoteInterface.
- */
-
 namespace Drupal\votingapi;
 
 use Drupal\Core\Entity\ContentEntityInterface;
diff --git a/src/VoteResultFunctionBase.php b/src/VoteResultFunctionBase.php
index 5d2caad..f3f24e0 100644
--- a/src/VoteResultFunctionBase.php
+++ b/src/VoteResultFunctionBase.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\votingapi\VoteResultFunctionBase.
- */
-
 namespace Drupal\votingapi;
 
 use Drupal\Core\Plugin\PluginBase;
diff --git a/src/VoteResultFunctionInterface.php b/src/VoteResultFunctionInterface.php
index 9ab6ac3..c9301c6 100644
--- a/src/VoteResultFunctionInterface.php
+++ b/src/VoteResultFunctionInterface.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\votingapi\VoteResultFunctionInterface.
- */
-
 namespace Drupal\votingapi;
 
 /**
diff --git a/src/VoteResultFunctionManager.php b/src/VoteResultFunctionManager.php
index 084a79d..5fd90c3 100644
--- a/src/VoteResultFunctionManager.php
+++ b/src/VoteResultFunctionManager.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\votingapi\VoteResultFunctionManager.
- */
-
 namespace Drupal\votingapi;
 
 use Drupal\Core\Cache\CacheBackendInterface;
diff --git a/src/VoteResultInterface.php b/src/VoteResultInterface.php
index ab3f771..ce0fb7b 100644
--- a/src/VoteResultInterface.php
+++ b/src/VoteResultInterface.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\votingapi\VoteResultInterface.
- */
-
 namespace Drupal\votingapi;
 
 use Drupal\Core\Entity\ContentEntityInterface;
diff --git a/src/VoteResultStorage.php b/src/VoteResultStorage.php
index 8548de4..227e70d 100644
--- a/src/VoteResultStorage.php
+++ b/src/VoteResultStorage.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\votingapi\VoteResultStorage.
- */
-
 namespace Drupal\votingapi;
 
 use Drupal\votingapi\Entity\VoteResult;
diff --git a/src/VoteResultStorageInterface.php b/src/VoteResultStorageInterface.php
index 0a6c60b..0424695 100644
--- a/src/VoteResultStorageInterface.php
+++ b/src/VoteResultStorageInterface.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\votingapi\VoteResultStorageInterface.
- */
-
 namespace Drupal\votingapi;
 
 use Drupal\Core\Entity\EntityStorageInterface;
diff --git a/src/VoteStorage.php b/src/VoteStorage.php
index 4bb4249..91e35a2 100644
--- a/src/VoteStorage.php
+++ b/src/VoteStorage.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\votingapi\VoteStorage.
- */
-
 namespace Drupal\votingapi;
 
 use Drupal\Core\Entity\Sql\SqlContentEntityStorage;
diff --git a/src/VoteStorageInterface.php b/src/VoteStorageInterface.php
index 2d17eb4..2a7463f 100644
--- a/src/VoteStorageInterface.php
+++ b/src/VoteStorageInterface.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\votingapi\VoteStorageInterface.
- */
-
 namespace Drupal\votingapi;
 
 use Drupal\Core\Entity\EntityStorageInterface;
diff --git a/src/VoteTypeAccessControlHandler.php b/src/VoteTypeAccessControlHandler.php
index 82216cd..586b8f4 100644
--- a/src/VoteTypeAccessControlHandler.php
+++ b/src/VoteTypeAccessControlHandler.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\votingapi\VoteTypeAccessControlHandler.
- */
-
 namespace Drupal\votingapi;
 
 use Drupal\Core\Entity\EntityAccessControlHandler;
diff --git a/src/VoteTypeForm.php b/src/VoteTypeForm.php
index dc639c4..87393ef 100644
--- a/src/VoteTypeForm.php
+++ b/src/VoteTypeForm.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\votingapi\VoteTypeForm.
- */
-
 namespace Drupal\votingapi;
 
 use Drupal\Core\Entity\EntityForm;
diff --git a/src/VoteTypeInterface.php b/src/VoteTypeInterface.php
index 9d35047..7c8ab47 100644
--- a/src/VoteTypeInterface.php
+++ b/src/VoteTypeInterface.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\votingapi\VoteTypeInterface.
- */
-
 namespace Drupal\votingapi;
 
 use Drupal\Core\Config\Entity\ConfigEntityInterface;
diff --git a/src/VoteTypeListBuilder.php b/src/VoteTypeListBuilder.php
index 647bd24..e6f2332 100644
--- a/src/VoteTypeListBuilder.php
+++ b/src/VoteTypeListBuilder.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\votingapi\VoteTypeListBuilder.
- */
-
 namespace Drupal\votingapi;
 
 use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
diff --git a/tests/modules/votingapi_test/src/Plugin/VoteResultFunction/Zebra.php b/tests/modules/votingapi_test/src/Plugin/VoteResultFunction/Zebra.php
index 5bc23f8..68da730 100644
--- a/tests/modules/votingapi_test/src/Plugin/VoteResultFunction/Zebra.php
+++ b/tests/modules/votingapi_test/src/Plugin/VoteResultFunction/Zebra.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\votingapi_test\Plugin\VoteResultFunction\Zebra.
- */
-
 namespace Drupal\votingapi_test\Plugin\VoteResultFunction;
 
 use Drupal\votingapi\VoteResultFunctionBase;
diff --git a/tests/modules/votingapi_test/votingapi_test.module b/tests/modules/votingapi_test/votingapi_test.module
index 1d64401..31853bd 100644
--- a/tests/modules/votingapi_test/votingapi_test.module
+++ b/tests/modules/votingapi_test/votingapi_test.module
@@ -1,6 +1,5 @@
 <?php
 /**
- * @file
  * Just an empty file to Drupal understand that this is a module.
  */
 ?>
\ No newline at end of file
diff --git a/votingapi.api.php b/votingapi.api.php
index 71ca653..7070123 100644
--- a/votingapi.api.php
+++ b/votingapi.api.php
@@ -1,7 +1,6 @@
 <?php
 
 /**
- * @file
  * Provides hook documentation for the VotingAPI module.
  */
 
diff --git a/votingapi.drush.inc b/votingapi.drush.inc
index 800fa98..43019b5 100644
--- a/votingapi.drush.inc
+++ b/votingapi.drush.inc
@@ -1,7 +1,6 @@
 <?php
 
 /**
- * @file
  *  Generate votingapi votes, recalculate results for existing votes, or flush
  *  VotingAPI data entirely.
  */
diff --git a/votingapi.install b/votingapi.install
index 181bb8c..2cfd9c9 100644
--- a/votingapi.install
+++ b/votingapi.install
@@ -1,7 +1,6 @@
 <?php
 
 /**
- * @file
  * Installation file for VotingAPI module.
  */
 
diff --git a/votingapi.module b/votingapi.module
index ce74b03..5232fca 100644
--- a/votingapi.module
+++ b/votingapi.module
@@ -1,9 +1,6 @@
 <?php
 
 /**
- * @file
- * Contains votingapi.module.
- *
  * A generalized voting API for Drupal.
  *
  * Maintains and provides an interface for a shared bin of vote and rating