diff --git a/README.md b/README.md
index 0eda4a0..41a8b04 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,13 @@
 Address
 =======
-[![Build Status](https://travis-ci.org/bojanz/address.svg?branch=8.x-1.x)]
-(https://travis-ci.org/bojanz/address)
+[![Build Status](https://travis-ci.org/bojanz/address.svg?branch=8.x-1.x)](https://travis-ci.org/bojanz/address)
 
-Provides functionality for storing, validating and displaying
-international postal addresses.
-The Drupal 8 heir to the addressfield module, powered by 
-the [commerceguys/addressing](https://github.com/commerceguys/addressing) 
-and [commerceguys/zone](https://github.com/commerceguys/zone) libraries.
+Provides functionality for storing, validating and displaying international postal addresses.
+The Drupal 8 heir to the addressfield module, powered by the [commerceguys/addressing](https://github.com/commerceguys/addressing) and [commerceguys/zone](https://github.com/commerceguys/zone) libraries.
 
 Installation
 -------------
-This module needs to be installed via Composer, which will download
-the required libraries.
+This module needs to be installed via Composer, which will download the required libraries.
 
 1. Add the Drupal Packagist repository
 
diff --git a/src/AddressInterface.php b/src/AddressInterface.php
index 4adc0eb..e44c3c8 100644
--- a/src/AddressInterface.php
+++ b/src/AddressInterface.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Defines the interface for addresses.
- */
 
 namespace Drupal\address;
 
diff --git a/src/AddressServiceProvider.php b/src/AddressServiceProvider.php
index 6c6d2d3..4c28744 100644
--- a/src/AddressServiceProvider.php
+++ b/src/AddressServiceProvider.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Overrides the country_manager service.
- */
 
 namespace Drupal\address;
 
diff --git a/src/Annotation/ZoneMember.php b/src/Annotation/ZoneMember.php
index adc2a33..4861c8b 100644
--- a/src/Annotation/ZoneMember.php
+++ b/src/Annotation/ZoneMember.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Defines a zone member annotation object.
- */
 
 namespace Drupal\address\Annotation;
 
diff --git a/src/Entity/Zone.php b/src/Entity/Zone.php
index e195967..1d56684 100644
--- a/src/Entity/Zone.php
+++ b/src/Entity/Zone.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Defines the Zone configuration entity.
- */
 
 namespace Drupal\address\Entity;
 
diff --git a/src/Entity/ZoneInterface.php b/src/Entity/ZoneInterface.php
index 9cdeef1..da9a0b6 100644
--- a/src/Entity/ZoneInterface.php
+++ b/src/Entity/ZoneInterface.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Defines the interface for zones.
- */
 
 namespace Drupal\address\Entity;
 
diff --git a/src/Event/AddressEvents.php b/src/Event/AddressEvents.php
index 70d2d2d..1dce978 100644
--- a/src/Event/AddressEvents.php
+++ b/src/Event/AddressEvents.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Defines events for the address module.
- */
 
 namespace Drupal\address\Event;
 
diff --git a/src/Event/AddressFormatEvent.php b/src/Event/AddressFormatEvent.php
index ff2341b..b9f2e0d 100644
--- a/src/Event/AddressFormatEvent.php
+++ b/src/Event/AddressFormatEvent.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Defines the address format event.
- */
 
 namespace Drupal\address\Event;
 
diff --git a/src/Event/AvailableCountriesEvent.php b/src/Event/AvailableCountriesEvent.php
index 414c136..aeed6bf 100644
--- a/src/Event/AvailableCountriesEvent.php
+++ b/src/Event/AvailableCountriesEvent.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Defines the available countries event.
- */
 
 namespace Drupal\address\Event;
 
diff --git a/src/Event/InitialValuesEvent.php b/src/Event/InitialValuesEvent.php
index acffde5..a40c322 100644
--- a/src/Event/InitialValuesEvent.php
+++ b/src/Event/InitialValuesEvent.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Defines the initial values event.
- */
 
 namespace Drupal\address\Event;
 
diff --git a/src/Event/SubdivisionsEvent.php b/src/Event/SubdivisionsEvent.php
index 5e3119c..a56c9bd 100644
--- a/src/Event/SubdivisionsEvent.php
+++ b/src/Event/SubdivisionsEvent.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Defines the subdivisions event.
- */
 
 namespace Drupal\address\Event;
 
diff --git a/src/FieldHelper.php b/src/FieldHelper.php
index 6435f50..f4a7b30 100644
--- a/src/FieldHelper.php
+++ b/src/FieldHelper.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Provides property names and autocomplete attributes for AddressField values.
- */
 
 namespace Drupal\address;
 
diff --git a/src/Form/ZoneForm.php b/src/Form/ZoneForm.php
index c9b79b9..50e3750 100644
--- a/src/Form/ZoneForm.php
+++ b/src/Form/ZoneForm.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Defines the zone form creation.
- */
 
 namespace Drupal\address\Form;
 
diff --git a/src/LabelHelper.php b/src/LabelHelper.php
index 597234b..bb34ad6 100644
--- a/src/LabelHelper.php
+++ b/src/LabelHelper.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Provides translated labels for the library enums.
- */
 
 namespace Drupal\address;
 
diff --git a/src/Plugin/EntityReferenceSelection/ZoneSelection.php b/src/Plugin/EntityReferenceSelection/ZoneSelection.php
index af20c44..a225291 100644
--- a/src/Plugin/EntityReferenceSelection/ZoneSelection.php
+++ b/src/Plugin/EntityReferenceSelection/ZoneSelection.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Provides an entity reference selection plugin for zones.
- */
 
 namespace Drupal\address\Plugin\EntityReferenceSelection;
 
diff --git a/src/Plugin/Field/FieldFormatter/AddressDefaultFormatter.php b/src/Plugin/Field/FieldFormatter/AddressDefaultFormatter.php
index c3b25c1..cf88250 100644
--- a/src/Plugin/Field/FieldFormatter/AddressDefaultFormatter.php
+++ b/src/Plugin/Field/FieldFormatter/AddressDefaultFormatter.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Provides plugin implementation of the 'address_default' formatter.
- */
 
 namespace Drupal\address\Plugin\Field\FieldFormatter;
 
diff --git a/src/Plugin/Field/FieldFormatter/AddressPlainFormatter.php b/src/Plugin/Field/FieldFormatter/AddressPlainFormatter.php
index 6aa785b..d776247 100644
--- a/src/Plugin/Field/FieldFormatter/AddressPlainFormatter.php
+++ b/src/Plugin/Field/FieldFormatter/AddressPlainFormatter.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Provides plugin implementation of the 'address_plain' formatter.
- */
 
 namespace Drupal\address\Plugin\Field\FieldFormatter;
 
diff --git a/src/Plugin/Field/FieldType/AddressItem.php b/src/Plugin/Field/FieldType/AddressItem.php
index 98a73da..877e966 100644
--- a/src/Plugin/Field/FieldType/AddressItem.php
+++ b/src/Plugin/Field/FieldType/AddressItem.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Provides plugin implementation of the 'address' field type.
- */
 
 namespace Drupal\address\Plugin\Field\FieldType;
 
diff --git a/src/Plugin/Field/FieldWidget/AddressDefaultWidget.php b/src/Plugin/Field/FieldWidget/AddressDefaultWidget.php
index db1ff7d..deb1b6a 100644
--- a/src/Plugin/Field/FieldWidget/AddressDefaultWidget.php
+++ b/src/Plugin/Field/FieldWidget/AddressDefaultWidget.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Provides plugin implementation of the 'address' widget.
- */
 
 namespace Drupal\address\Plugin\Field\FieldWidget;
 
diff --git a/src/Plugin/Validation/Constraint/AddressFormatConstraint.php b/src/Plugin/Validation/Constraint/AddressFormatConstraint.php
index b87bd86..e7548b2 100644
--- a/src/Plugin/Validation/Constraint/AddressFormatConstraint.php
+++ b/src/Plugin/Validation/Constraint/AddressFormatConstraint.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains address format constraint.
- */
 
 namespace Drupal\address\Plugin\Validation\Constraint;
 
diff --git a/src/Plugin/Validation/Constraint/AddressFormatConstraintValidator.php b/src/Plugin/Validation/Constraint/AddressFormatConstraintValidator.php
index 7c0dc04..7e8901c 100644
--- a/src/Plugin/Validation/Constraint/AddressFormatConstraintValidator.php
+++ b/src/Plugin/Validation/Constraint/AddressFormatConstraintValidator.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Validates the address format constraint.
- */
 
 namespace Drupal\address\Plugin\Validation\Constraint;
 
diff --git a/src/Plugin/Validation/Constraint/CountryConstraint.php b/src/Plugin/Validation/Constraint/CountryConstraint.php
index 410b948..65ae2ee 100644
--- a/src/Plugin/Validation/Constraint/CountryConstraint.php
+++ b/src/Plugin/Validation/Constraint/CountryConstraint.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Provides country constraint.
- */
 
 namespace Drupal\address\Plugin\Validation\Constraint;
 
diff --git a/src/Plugin/Validation/Constraint/CountryConstraintValidator.php b/src/Plugin/Validation/Constraint/CountryConstraintValidator.php
index be527df..95d39b5 100644
--- a/src/Plugin/Validation/Constraint/CountryConstraintValidator.php
+++ b/src/Plugin/Validation/Constraint/CountryConstraintValidator.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Provides the country constraint validation.
- */
 
 namespace Drupal\address\Plugin\Validation\Constraint;
 
diff --git a/src/Plugin/ZoneMember/ZoneMemberBase.php b/src/Plugin/ZoneMember/ZoneMemberBase.php
index de980d2..5a40fa6 100644
--- a/src/Plugin/ZoneMember/ZoneMemberBase.php
+++ b/src/Plugin/ZoneMember/ZoneMemberBase.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Defines a base zone member class.
- */
 
 namespace Drupal\address\Plugin\ZoneMember;
 
diff --git a/src/Plugin/ZoneMember/ZoneMemberCountry.php b/src/Plugin/ZoneMember/ZoneMemberCountry.php
index c430926..f4a67ec 100644
--- a/src/Plugin/ZoneMember/ZoneMemberCountry.php
+++ b/src/Plugin/ZoneMember/ZoneMemberCountry.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Matches a country, its subdivisions, and its postal codes.
- */
 
 namespace Drupal\address\Plugin\ZoneMember;
 
diff --git a/src/Plugin/ZoneMember/ZoneMemberEu.php b/src/Plugin/ZoneMember/ZoneMemberEu.php
index 4ee4575..830aa36 100644
--- a/src/Plugin/ZoneMember/ZoneMemberEu.php
+++ b/src/Plugin/ZoneMember/ZoneMemberEu.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Matches EU addresses.
- */
 
 namespace Drupal\address\Plugin\ZoneMember;
 
diff --git a/src/Plugin/ZoneMember/ZoneMemberInterface.php b/src/Plugin/ZoneMember/ZoneMemberInterface.php
index 871e638..cf2f477 100644
--- a/src/Plugin/ZoneMember/ZoneMemberInterface.php
+++ b/src/Plugin/ZoneMember/ZoneMemberInterface.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Defines the interface for zone members.
- */
 
 namespace Drupal\address\Plugin\ZoneMember;
 
diff --git a/src/Plugin/ZoneMember/ZoneMemberZone.php b/src/Plugin/ZoneMember/ZoneMemberZone.php
index a176b80..6dedf02 100644
--- a/src/Plugin/ZoneMember/ZoneMemberZone.php
+++ b/src/Plugin/ZoneMember/ZoneMemberZone.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Matches a single zone.
- */
 
 namespace Drupal\address\Plugin\ZoneMember;
 
diff --git a/src/Plugin/migrate/cckfield/AddressField.php b/src/Plugin/migrate/cckfield/AddressField.php
index ac0c0b6..e4d4c3f 100644
--- a/src/Plugin/migrate/cckfield/AddressField.php
+++ b/src/Plugin/migrate/cckfield/AddressField.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Provides implementation of the address field migration.
- */
 
 namespace Drupal\address\Plugin\migrate\cckfield;
 
diff --git a/src/Plugin/migrate/process/AddressField.php b/src/Plugin/migrate/process/AddressField.php
index ca6f23a..dec98ab 100644
--- a/src/Plugin/migrate/process/AddressField.php
+++ b/src/Plugin/migrate/process/AddressField.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Provides mapping facility from D7 addressfield values to address values.
- */
 
 namespace Drupal\address\Plugin\migrate\process;
 
diff --git a/src/Plugin/views/field/CountryCode.php b/src/Plugin/views/field/CountryCode.php
index aee1bb3..65adb1e 100644
--- a/src/Plugin/views/field/CountryCode.php
+++ b/src/Plugin/views/field/CountryCode.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Allows the country name to be displayed instead of the country code.
- */
 
 namespace Drupal\address\Plugin\views\field;
 
diff --git a/src/Plugin/views/field/Subdivision.php b/src/Plugin/views/field/Subdivision.php
index e001c2f..fe1939b 100644
--- a/src/Plugin/views/field/Subdivision.php
+++ b/src/Plugin/views/field/Subdivision.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Displays the subdivision.
- */
 
 namespace Drupal\address\Plugin\views\field;
 
diff --git a/src/Plugin/views/filter/CountryCode.php b/src/Plugin/views/filter/CountryCode.php
index c1aa5ad..374b619 100644
--- a/src/Plugin/views/filter/CountryCode.php
+++ b/src/Plugin/views/filter/CountryCode.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Provides filter by country.
- */
 
 namespace Drupal\address\Plugin\views\filter;
 
diff --git a/src/PluginDefinition/ZoneMemberPluginDefinitionDecorator.php b/src/PluginDefinition/ZoneMemberPluginDefinitionDecorator.php
index d5caa1b..b1d35b1 100644
--- a/src/PluginDefinition/ZoneMemberPluginDefinitionDecorator.php
+++ b/src/PluginDefinition/ZoneMemberPluginDefinitionDecorator.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Provides a zone member plugin definition decorator.
- */
 
 namespace Drupal\address\PluginDefinition;
 
diff --git a/src/Repository/AddressFormatRepository.php b/src/Repository/AddressFormatRepository.php
index 0e3f0f9..43fdbdc 100644
--- a/src/Repository/AddressFormatRepository.php
+++ b/src/Repository/AddressFormatRepository.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Defines the country repository.
- */
 
 namespace Drupal\address\Repository;
 
diff --git a/src/Repository/CountryRepository.php b/src/Repository/CountryRepository.php
index be32ffd..5bd4ca3 100644
--- a/src/Repository/CountryRepository.php
+++ b/src/Repository/CountryRepository.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Defines the country repository.
- */
 
 namespace Drupal\address\Repository;
 
diff --git a/src/Repository/SubdivisionRepository.php b/src/Repository/SubdivisionRepository.php
index cacf9c9..e83462c 100644
--- a/src/Repository/SubdivisionRepository.php
+++ b/src/Repository/SubdivisionRepository.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Provides address format constraint.
- */
 
 namespace Drupal\address\Repository;
 
diff --git a/src/Repository/ZoneRepository.php b/src/Repository/ZoneRepository.php
index b98ccf9..369c699 100644
--- a/src/Repository/ZoneRepository.php
+++ b/src/Repository/ZoneRepository.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Defines the zone repository.
- */
 
 namespace Drupal\address\Repository;
 
diff --git a/src/ZoneListBuilder.php b/src/ZoneListBuilder.php
index 0426919..3f5e4a8 100644
--- a/src/ZoneListBuilder.php
+++ b/src/ZoneListBuilder.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Provides a listing of zones.
- */
 
 namespace Drupal\address;
 
diff --git a/src/ZoneMemberManager.php b/src/ZoneMemberManager.php
index 78e3c7a..c5e1d8a 100644
--- a/src/ZoneMemberManager.php
+++ b/src/ZoneMemberManager.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Manages zone member plugins.
- */
 
 namespace Drupal\address;
 
diff --git a/src/ZoneMemberPluginCollection.php b/src/ZoneMemberPluginCollection.php
index 25009f0..b0cb2b1 100644
--- a/src/ZoneMemberPluginCollection.php
+++ b/src/ZoneMemberPluginCollection.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains a collection of zone members..
- */
 
 namespace Drupal\address;
 
diff --git a/tests/modules/address_test/src/EventSubscriber/AddressTestEventSubscriber.php b/tests/modules/address_test/src/EventSubscriber/AddressTestEventSubscriber.php
index 7bd6d75..7ee48cb 100644
--- a/tests/modules/address_test/src/EventSubscriber/AddressTestEventSubscriber.php
+++ b/tests/modules/address_test/src/EventSubscriber/AddressTestEventSubscriber.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Generates and alter set of avaible countries and initial values.
- */
 
 namespace Drupal\address_test\EventSubscriber;
 
diff --git a/tests/modules/address_test/src/EventSubscriber/GreatBritainEventSubscriber.php b/tests/modules/address_test/src/EventSubscriber/GreatBritainEventSubscriber.php
index f5ccd4d..af002e3 100644
--- a/tests/modules/address_test/src/EventSubscriber/GreatBritainEventSubscriber.php
+++ b/tests/modules/address_test/src/EventSubscriber/GreatBritainEventSubscriber.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Provides functionality for Great Britain.
- */
 
 namespace Drupal\address_test\EventSubscriber;
 
diff --git a/tests/src/FunctionalJavascript/AddressDefaultWidgetTest.php b/tests/src/FunctionalJavascript/AddressDefaultWidgetTest.php
index fa899d4..ddd2fcb 100644
--- a/tests/src/FunctionalJavascript/AddressDefaultWidgetTest.php
+++ b/tests/src/FunctionalJavascript/AddressDefaultWidgetTest.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Provides functionality for Great Britain.
- */
 
 namespace Drupal\Tests\address\FunctionalJavascript;
 
diff --git a/tests/src/FunctionalJavascript/ZoneTest.php b/tests/src/FunctionalJavascript/ZoneTest.php
index 03dcdb8..11c45ba 100644
--- a/tests/src/FunctionalJavascript/ZoneTest.php
+++ b/tests/src/FunctionalJavascript/ZoneTest.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Tests the zone entity and UI.
- */
 
 namespace Drupal\Tests\address\FunctionalJavascript;
 
diff --git a/tests/src/Kernel/Formatter/DefaultFormatterTest.php b/tests/src/Kernel/Formatter/DefaultFormatterTest.php
index bd406cf..4e6d640 100644
--- a/tests/src/Kernel/Formatter/DefaultFormatterTest.php
+++ b/tests/src/Kernel/Formatter/DefaultFormatterTest.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Provides default formatter testing.
- */
 
 namespace Drupal\Tests\address\Kernel\Formatter;
 
diff --git a/tests/src/Kernel/Formatter/PlainFormatterTest.php b/tests/src/Kernel/Formatter/PlainFormatterTest.php
index 1d54cf4..d632a44 100644
--- a/tests/src/Kernel/Formatter/PlainFormatterTest.php
+++ b/tests/src/Kernel/Formatter/PlainFormatterTest.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Provides plain formatter testing.
- */
 
 namespace Drupal\Tests\address\Kernel\Formatter;
 
diff --git a/tests/src/Unit/Plugin/Validation/Constraint/CountryConstraintValidatorTest.php b/tests/src/Unit/Plugin/Validation/Constraint/CountryConstraintValidatorTest.php
index fd14d56..941e55c 100644
--- a/tests/src/Unit/Plugin/Validation/Constraint/CountryConstraintValidatorTest.php
+++ b/tests/src/Unit/Plugin/Validation/Constraint/CountryConstraintValidatorTest.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Provides validation testing for country.
- */
 
 namespace Drupal\Tests\address\Unit\Plugin\Validation\Constraint;