diff --git a/src/BarcodeClient.php b/src/BarcodeClient.php
index 1831ce4..2e58979 100644
--- a/src/BarcodeClient.php
+++ b/src/BarcodeClient.php
@@ -21,8 +21,7 @@ class BarcodeClient extends BaseClient
     const SANDBOX_WSDL = 'https://api-sandbox.postnl.nl/shipment/v1_1/barcode/soap.wsdl';
 
     /**
-     * @var array
-     *     The complex types used by this client.
+     * @var array The complex types used by this client.
      */
     protected $classes = [
         'GenerateBarcodeMessage',
diff --git a/src/BaseClient.php b/src/BaseClient.php
index e3f84f6..84af4d1 100644
--- a/src/BaseClient.php
+++ b/src/BaseClient.php
@@ -9,7 +9,9 @@ abstract class BaseClient extends SoapClient
 {
 
     /**
-     * @var string The URL of the production WSDL. Actual clients must define this.
+     * @var string The URL of the production WSDL.
+     *
+     * Actual clients must define this.
      */
     const PRODUCTION_WSDL = '';
 
@@ -19,8 +21,7 @@ abstract class BaseClient extends SoapClient
     const SANDBOX_WSDL = '';
 
     /**
-     * @var array
-     *     A list of complex types used to generate a classmap for SoapClient.
+     * @var array A list of complex types for generating a SoapClient classmap.
      *
      * @see self::getClassmap()
      */
@@ -55,8 +56,7 @@ public function __construct($apikey, $sandbox = false, $wsdl = null)
     }
 
     /**
-     * @return array
-     *     The classmap generated from self::$classes.
+     * @return array The classmap generated from self::$classes.
      */
     protected function getClassmap()
     {
diff --git a/src/ComplexTypes/Address.php b/src/ComplexTypes/Address.php
index 6396146..9c69e09 100644
--- a/src/ComplexTypes/Address.php
+++ b/src/ComplexTypes/Address.php
@@ -104,20 +104,13 @@ class Address extends BaseType
      * @param string $Zipcode
      * @param string $City
      * @param string $Countrycode
-     * @param string $Area
-     *     Optional.
-     * @param string $Buildingname
-     *     Optional.
-     * @param string $Department
-     *     Optional.
-     * @param string $Doorcode
-     *     Optional.
-     * @param string $Floor
-     *     Optional.
-     * @param string $Region
-     *     Optional.
-     * @param string $Remark
-     *     Optional.
+     * @param string $Area Optional.
+     * @param string $Buildingname Optional.
+     * @param string $Department Optional.
+     * @param string $Doorcode Optional.
+     * @param string $Floor Optional.
+     * @param string $Region Optional.
+     * @param string $Remark Optional.
      */
     public function __construct(
         $AddressType,
diff --git a/src/ComplexTypes/Dimension.php b/src/ComplexTypes/Dimension.php
index 7dd7a32..9983f2a 100644
--- a/src/ComplexTypes/Dimension.php
+++ b/src/ComplexTypes/Dimension.php
@@ -30,14 +30,10 @@ class Dimension extends BaseType
 
     /**
      * @param string $Weight
-     * @param string $Height
-     *     Optional.
-     * @param string $Length
-     *     Optional.
-     * @param string $Volume
-     *     Optional.
-     * @param string $Width
-     *     Optional.
+     * @param string $Height Optional.
+     * @param string $Length Optional.
+     * @param string $Volume Optional.
+     * @param string $Width Optional.
      */
     public function __construct($Weight, $Height = null, $Length = null, $Volume = null, $Width = null)
     {
diff --git a/src/ComplexTypes/Message.php b/src/ComplexTypes/Message.php
index e807d17..e55532b 100644
--- a/src/ComplexTypes/Message.php
+++ b/src/ComplexTypes/Message.php
@@ -19,10 +19,8 @@ class Message extends BaseType
     protected $MessageTimeStamp = null;
 
     /**
-     * @param string $MessageID
-     *     Defaults to 1.
-     * @param string $MessageTimeStamp
-     *     Defaults to the current time.
+     * @param string $MessageID Defaults to 1.
+     * @param string $MessageTimeStamp Defaults to the current time.
      */
     public function __construct($MessageID = 1, $MessageTimeStamp = null)
     {
diff --git a/src/ComplexTypes/RequestShipment.php b/src/ComplexTypes/RequestShipment.php
index 69d26e7..8cf93bc 100644
--- a/src/ComplexTypes/RequestShipment.php
+++ b/src/ComplexTypes/RequestShipment.php
@@ -9,14 +9,12 @@ class RequestShipment extends BaseType
     protected $Barcode = null;
 
     /**
-     * @var string
-     *     Optional.
+     * @var string Optional.
      */
     protected $Reference = null;
 
     /**
-     * @var string
-     *     Optional.
+     * @var string Optional.
      */
     protected $Zipcode = null;
 
diff --git a/src/ConfirmingClient.php b/src/ConfirmingClient.php
index 600ca1f..b2ac1aa 100644
--- a/src/ConfirmingClient.php
+++ b/src/ConfirmingClient.php
@@ -17,8 +17,7 @@ class ConfirmingClient extends BaseClient
     const SANDBOX_WSDL = 'https://api-sandbox.postnl.nl/shipment/v1_9/confirm/soap.wsdl';
 
     /**
-     * @var array
-     *     The complex types used by this client.
+     * @var array The complex types used by this client.
      */
     protected $classes = [
         'ConfirmingMessage',
diff --git a/src/DeliveryDateClient.php b/src/DeliveryDateClient.php
index f77dd8b..f5601c1 100644
--- a/src/DeliveryDateClient.php
+++ b/src/DeliveryDateClient.php
@@ -17,8 +17,7 @@ class DeliveryDateClient extends BaseClient
     const SANDBOX_WSDL = 'https://api-sandbox.postnl.nl/shipment/v2_1/calculate/date/soap.wsdl';
 
     /**
-     * @var array
-     *     The complex types used by this client.
+     * @var array The complex types used by this client.
      */
     protected $classes = [
         'ArrayOfCutOffTime',
diff --git a/src/LabellingClient.php b/src/LabellingClient.php
index c1d6b3d..238edd9 100644
--- a/src/LabellingClient.php
+++ b/src/LabellingClient.php
@@ -17,8 +17,7 @@ class LabellingClient extends BaseClient
     const SANDBOX_WSDL = 'https://api-sandbox.postnl.nl/shipment/v2_0/label/soap.wsdl';
 
     /**
-     * @var array
-     *     The complex types used by this client.
+     * @var array The complex types used by this client.
      */
     protected $classes = [
         'GenerateLabelRequest',
diff --git a/src/LocationClient.php b/src/LocationClient.php
index 63a786b..fd7993d 100644
--- a/src/LocationClient.php
+++ b/src/LocationClient.php
@@ -17,8 +17,7 @@ class LocationClient extends BaseClient
     const SANDBOX_WSDL = 'https://api-sandbox.postnl.nl/shipment/v2_1/locations/soap.wsdl';
 
     /**
-     * @var array
-     *     The complex types used by this client.
+     * @var array The complex types used by this client.
      */
     protected $classes = [
         'Address',
diff --git a/src/Postnl.php b/src/Postnl.php
index 2804bb7..69f948c 100644
--- a/src/Postnl.php
+++ b/src/Postnl.php
@@ -50,14 +50,12 @@ class Postnl
     protected $sandbox = false;
 
     /**
-     * @var array
-     *     An array with instantiated CIF clients.
+     * @var array An array with instantiated CIF clients.
      */
     protected $clients = [];
 
     /**
-     * @var string
-     *     Contains the property name of the last used SOAP client.
+     * @var string Contains the property name of the last used SOAP client.
      */
     private $lastClient = null;
 
@@ -489,8 +487,10 @@ public function getDeliveryDate(
     /**
      * Returns location information of the supplied location code.
      *
-     * @param string $locationCode LocationCode information.
-     * @param string $retailNetworkId PNPNL-01 is the code that can be used for all Dutch locations.
+     * @param string $locationCode
+     *     LocationCode information.
+     * @param string $retailNetworkId
+     *     PNPNL-01 is the code that can be used for all Dutch locations.
      * @return ComplexTypes\GetLocationsResponse
      */
     public function getLocation($locationCode, $retailNetworkId = 'PNPNL-01')
diff --git a/src/ShippingStatusClient.php b/src/ShippingStatusClient.php
index 49e9672..c873472 100644
--- a/src/ShippingStatusClient.php
+++ b/src/ShippingStatusClient.php
@@ -17,8 +17,7 @@ class ShippingStatusClient extends BaseClient
     const SANDBOX_WSDL = 'https://api-sandbox.postnl.nl/shipment/v1_6/status/soap.wsdl';
 
     /**
-     * @var array
-     *     The complex types used by this client.
+     * @var array The complex types used by this client.
      */
     protected $classes = [
         'CurrentStatusRequest',
diff --git a/src/TimeframeClient.php b/src/TimeframeClient.php
index 798c4d7..d959391 100644
--- a/src/TimeframeClient.php
+++ b/src/TimeframeClient.php
@@ -17,8 +17,7 @@ class TimeframeClient extends BaseClient
     const SANDBOX_WSDL = 'https://api-sandbox.postnl.nl/shipment/v2_0/calculate/timeframes/soap.wsdl';
 
     /**
-     * @var array
-     *     The complex types used by this client.
+     * @var array The complex types used by this client.
      */
     protected $classes = [
         'GetTimeframes',