diff --git a/src/Amadeus/Client/InvalidMessageException.php b/src/Amadeus/Client/InvalidMessageException.php
index 4aacc475e..204b7eecd 100644
--- a/src/Amadeus/Client/InvalidMessageException.php
+++ b/src/Amadeus/Client/InvalidMessageException.php
@@ -32,5 +32,4 @@
  */
 class InvalidMessageException extends Exception
 {
-
 }
diff --git a/src/Amadeus/Client/Params.php b/src/Amadeus/Client/Params.php
index d8fe623d1..a3a019472 100644
--- a/src/Amadeus/Client/Params.php
+++ b/src/Amadeus/Client/Params.php
@@ -94,7 +94,8 @@ public function __construct($params = [])
      * @param array $params
      * @return void
      */
-    protected function loadFromArray(array $params) {
+    protected function loadFromArray(array $params)
+    {
         $this->loadRequestCreator($params);
         $this->loadSessionHandler($params);
         $this->loadResponseHandler($params);
diff --git a/src/Amadeus/Client/Params/AuthParams.php b/src/Amadeus/Client/Params/AuthParams.php
index 29dc4eab2..3951979ad 100644
--- a/src/Amadeus/Client/Params/AuthParams.php
+++ b/src/Amadeus/Client/Params/AuthParams.php
@@ -106,7 +106,8 @@ public function __construct($params = [])
      * @param array $params
      * @return void
      */
-    protected function loadFromArray(array $params) {
+    protected function loadFromArray(array $params)
+    {
         if (count($params) > 0) {
             $this->officeId = $params['officeId'];
             $this->originatorTypeCode = (isset($params['originatorTypeCode'])) ? $params['originatorTypeCode'] : "U";
diff --git a/src/Amadeus/Client/Params/SessionHandlerParams.php b/src/Amadeus/Client/Params/SessionHandlerParams.php
index 486cb7fa4..c1de89718 100644
--- a/src/Amadeus/Client/Params/SessionHandlerParams.php
+++ b/src/Amadeus/Client/Params/SessionHandlerParams.php
@@ -107,7 +107,8 @@ public function __construct($params = [])
      * @param array $params
      * @return void
      */
-    protected function loadFromArray(array $params) {
+    protected function loadFromArray(array $params)
+    {
         if (count($params) > 0) {
             if (isset($params['soapHeaderVersion'])) {
                 $this->soapHeaderVersion = $params['soapHeaderVersion'];
diff --git a/src/Amadeus/Client/RequestCreator/RequestCreatorInterface.php b/src/Amadeus/Client/RequestCreator/RequestCreatorInterface.php
index ebeeba95e..fa64b23a3 100644
--- a/src/Amadeus/Client/RequestCreator/RequestCreatorInterface.php
+++ b/src/Amadeus/Client/RequestCreator/RequestCreatorInterface.php
@@ -50,4 +50,4 @@ public function __construct(RequestCreatorParams $params);
      * @return mixed
      */
     public function createRequest($messageName, RequestOptionsInterface $params);
-}
\ No newline at end of file
+}
diff --git a/src/Amadeus/Client/RequestOptions/Air/RetrieveSeatMap/FrequentFlyer.php b/src/Amadeus/Client/RequestOptions/Air/RetrieveSeatMap/FrequentFlyer.php
index def26bab4..092d5f17f 100644
--- a/src/Amadeus/Client/RequestOptions/Air/RetrieveSeatMap/FrequentFlyer.php
+++ b/src/Amadeus/Client/RequestOptions/Air/RetrieveSeatMap/FrequentFlyer.php
@@ -21,6 +21,7 @@
  */
 
 namespace Amadeus\Client\RequestOptions\Air\RetrieveSeatMap;
+
 use Amadeus\Client\LoadParamsFromArray;
 
 /**
diff --git a/src/Amadeus/Client/RequestOptions/Air/SellFromRecommendation/Itinerary.php b/src/Amadeus/Client/RequestOptions/Air/SellFromRecommendation/Itinerary.php
index db5a60cd2..fc97e94d9 100644
--- a/src/Amadeus/Client/RequestOptions/Air/SellFromRecommendation/Itinerary.php
+++ b/src/Amadeus/Client/RequestOptions/Air/SellFromRecommendation/Itinerary.php
@@ -45,5 +45,4 @@ class Itinerary extends LoadParamsFromArray
      * @var Segment[]
      */
     public $segments;
-
 }
diff --git a/src/Amadeus/Client/RequestOptions/AirSellFromRecommendationOptions.php b/src/Amadeus/Client/RequestOptions/AirSellFromRecommendationOptions.php
index 489d50baf..ef0bfea50 100644
--- a/src/Amadeus/Client/RequestOptions/AirSellFromRecommendationOptions.php
+++ b/src/Amadeus/Client/RequestOptions/AirSellFromRecommendationOptions.php
@@ -46,5 +46,4 @@ class AirSellFromRecommendationOptions extends Base
      * @var Air\SellFromRecommendation\Itinerary[]
      */
     public $itinerary = [];
-
 }
diff --git a/src/Amadeus/Client/RequestOptions/Base.php b/src/Amadeus/Client/RequestOptions/Base.php
index 8813b37c2..e0deac423 100644
--- a/src/Amadeus/Client/RequestOptions/Base.php
+++ b/src/Amadeus/Client/RequestOptions/Base.php
@@ -36,5 +36,4 @@
  */
 abstract class Base extends LoadParamsFromArray implements RequestOptionsInterface
 {
-
 }
diff --git a/src/Amadeus/Client/RequestOptions/Fare/InformativePricing/PricingOptions.php b/src/Amadeus/Client/RequestOptions/Fare/InformativePricing/PricingOptions.php
index 921fdd669..4a26f351e 100644
--- a/src/Amadeus/Client/RequestOptions/Fare/InformativePricing/PricingOptions.php
+++ b/src/Amadeus/Client/RequestOptions/Fare/InformativePricing/PricingOptions.php
@@ -34,5 +34,4 @@
  */
 class PricingOptions extends FarePricePnrWithBookingClassOptions
 {
-
 }
diff --git a/src/Amadeus/Client/RequestOptions/Fare/MPPassenger.php b/src/Amadeus/Client/RequestOptions/Fare/MPPassenger.php
index 5dae0ea72..60b1959be 100644
--- a/src/Amadeus/Client/RequestOptions/Fare/MPPassenger.php
+++ b/src/Amadeus/Client/RequestOptions/Fare/MPPassenger.php
@@ -32,7 +32,7 @@
  */
 class MPPassenger extends LoadParamsFromArray
 {
-    CONST TYPE_ADULT = "ADT";
+    const TYPE_ADULT = "ADT";
 
     const TYPE_CHILD = "CH";
 
diff --git a/src/Amadeus/Client/RequestOptions/Fare/PricePnrBcFareBasis.php b/src/Amadeus/Client/RequestOptions/Fare/PricePnrBcFareBasis.php
index 12fe685c5..0f835d216 100644
--- a/src/Amadeus/Client/RequestOptions/Fare/PricePnrBcFareBasis.php
+++ b/src/Amadeus/Client/RequestOptions/Fare/PricePnrBcFareBasis.php
@@ -21,6 +21,7 @@
  */
 
 namespace Amadeus\Client\RequestOptions\Fare;
+
 use Amadeus\Client\LoadParamsFromArray;
 
 /**
@@ -32,6 +33,7 @@
 class PricePnrBcFareBasis extends LoadParamsFromArray
 {
     const SEGREFTYPE_SEGMENT = 'S';
+
     const SEGREFTYPE_CONNECTING = 'X';
 
     /**
diff --git a/src/Amadeus/Client/RequestOptions/MiniRule/Pricing.php b/src/Amadeus/Client/RequestOptions/MiniRule/Pricing.php
index e2143eded..93f09803f 100644
--- a/src/Amadeus/Client/RequestOptions/MiniRule/Pricing.php
+++ b/src/Amadeus/Client/RequestOptions/MiniRule/Pricing.php
@@ -21,6 +21,7 @@
  */
 
 namespace Amadeus\Client\RequestOptions\MiniRule;
+
 use Amadeus\Client\LoadParamsFromArray;
 
 /**
diff --git a/src/Amadeus/Client/RequestOptions/Offer/PassengerDef.php b/src/Amadeus/Client/RequestOptions/Offer/PassengerDef.php
index 7c9d40c87..edc02450c 100644
--- a/src/Amadeus/Client/RequestOptions/Offer/PassengerDef.php
+++ b/src/Amadeus/Client/RequestOptions/Offer/PassengerDef.php
@@ -50,4 +50,4 @@ class PassengerDef extends LoadParamsFromArray
      * @var int
      */
     public $passengerTattoo;
-}
\ No newline at end of file
+}
diff --git a/src/Amadeus/Client/RequestOptions/Pnr/Element/FrequentFlyer.php b/src/Amadeus/Client/RequestOptions/Pnr/Element/FrequentFlyer.php
index 2983e201a..dfe4032c5 100644
--- a/src/Amadeus/Client/RequestOptions/Pnr/Element/FrequentFlyer.php
+++ b/src/Amadeus/Client/RequestOptions/Pnr/Element/FrequentFlyer.php
@@ -45,5 +45,4 @@ class FrequentFlyer extends Element
      * @var string
      */
     public $number;
-
 }
diff --git a/src/Amadeus/Client/RequestOptions/Pnr/Element/OtherServiceInfo.php b/src/Amadeus/Client/RequestOptions/Pnr/Element/OtherServiceInfo.php
index 87d17ecb0..578d80a20 100644
--- a/src/Amadeus/Client/RequestOptions/Pnr/Element/OtherServiceInfo.php
+++ b/src/Amadeus/Client/RequestOptions/Pnr/Element/OtherServiceInfo.php
@@ -22,13 +22,15 @@
 
 namespace Amadeus\Client\RequestOptions\Pnr\Element;
 
+use Amadeus\Client\RequestOptions\Pnr\Element;
+
 /**
  * OtherServiceInfo
  *
  * @package Amadeus\Client\RequestOptions\Pnr\Element
  * @author Dieter Devlieghere <dieter.devlieghere@benelux.amadeus.com>
  */
-class OtherServiceInfo
+class OtherServiceInfo extends Element
 {
-
+    //TODO: Not yet implemented
 }
diff --git a/src/Amadeus/Client/RequestOptions/Pnr/Element/Ticketing.php b/src/Amadeus/Client/RequestOptions/Pnr/Element/Ticketing.php
index afcd5c639..a33c7f2af 100644
--- a/src/Amadeus/Client/RequestOptions/Pnr/Element/Ticketing.php
+++ b/src/Amadeus/Client/RequestOptions/Pnr/Element/Ticketing.php
@@ -68,5 +68,4 @@ class Ticketing extends Element
      * @var Queue
      */
     public $ticketQueue;
-
 }
diff --git a/src/Amadeus/Client/RequestOptions/Pnr/Passenger.php b/src/Amadeus/Client/RequestOptions/Pnr/Passenger.php
deleted file mode 100644
index 8353ffb5b..000000000
--- a/src/Amadeus/Client/RequestOptions/Pnr/Passenger.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * amadeus-ws-client
- *
- * Copyright 2015 Amadeus Benelux NV
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * @package Amadeus
- * @license https://opensource.org/licenses/Apache-2.0 Apache 2.0
- */
-
-namespace Amadeus\Client\RequestOptions\Pnr;
-
-/**
- * Passenger
- *
- * @package Amadeus\Client\RequestOptions\Pnr
- * @author Dieter Devlieghere <dieter.devlieghere@benelux.amadeus.com>
- */
-class Passenger
-{
-
-}
diff --git a/src/Amadeus/Client/RequestOptions/Pnr/Segment/Hotel.php b/src/Amadeus/Client/RequestOptions/Pnr/Segment/Hotel.php
index c31a9e15e..c61a0011d 100644
--- a/src/Amadeus/Client/RequestOptions/Pnr/Segment/Hotel.php
+++ b/src/Amadeus/Client/RequestOptions/Pnr/Segment/Hotel.php
@@ -32,5 +32,4 @@
  */
 class Hotel extends Segment
 {
-
 }
diff --git a/src/Amadeus/Client/RequestOptions/Pnr/Traveller.php b/src/Amadeus/Client/RequestOptions/Pnr/Traveller.php
index 4220c791c..b1e7675b0 100644
--- a/src/Amadeus/Client/RequestOptions/Pnr/Traveller.php
+++ b/src/Amadeus/Client/RequestOptions/Pnr/Traveller.php
@@ -38,7 +38,6 @@ class Traveller extends LoadParamsFromArray
 
     const TRAV_TYPE_INFANT = "INF";
 
-
     /**
      * Unique sequence number for traveller
      *
diff --git a/src/Amadeus/Client/RequestOptions/PnrAddMultiElementsOptions.php b/src/Amadeus/Client/RequestOptions/PnrAddMultiElementsOptions.php
index c81af3ae7..b332ebe84 100644
--- a/src/Amadeus/Client/RequestOptions/PnrAddMultiElementsOptions.php
+++ b/src/Amadeus/Client/RequestOptions/PnrAddMultiElementsOptions.php
@@ -63,4 +63,4 @@ class PnrAddMultiElementsOptions extends PnrAddMultiElementsBase
      * @var Pnr\Element[]
      */
     public $elements = [];
-}
\ No newline at end of file
+}
diff --git a/src/Amadeus/Client/RequestOptions/PnrRetrieveOptions.php b/src/Amadeus/Client/RequestOptions/PnrRetrieveOptions.php
index 6319fdc54..be75713c5 100644
--- a/src/Amadeus/Client/RequestOptions/PnrRetrieveOptions.php
+++ b/src/Amadeus/Client/RequestOptions/PnrRetrieveOptions.php
@@ -38,4 +38,4 @@ class PnrRetrieveOptions extends Base
      * @var string
      */
     public $recordLocator;
-}
\ No newline at end of file
+}
diff --git a/src/Amadeus/Client/RequestOptions/RequestOptionsInterface.php b/src/Amadeus/Client/RequestOptions/RequestOptionsInterface.php
index 55c649967..b68a4ce66 100644
--- a/src/Amadeus/Client/RequestOptions/RequestOptionsInterface.php
+++ b/src/Amadeus/Client/RequestOptions/RequestOptionsInterface.php
@@ -32,5 +32,4 @@
  */
 interface RequestOptionsInterface
 {
-
-}
\ No newline at end of file
+}
diff --git a/src/Amadeus/Client/RequestOptions/SecurityAuthenticateOptions.php b/src/Amadeus/Client/RequestOptions/SecurityAuthenticateOptions.php
index 17269a262..2c2b7f61a 100644
--- a/src/Amadeus/Client/RequestOptions/SecurityAuthenticateOptions.php
+++ b/src/Amadeus/Client/RequestOptions/SecurityAuthenticateOptions.php
@@ -21,6 +21,7 @@
  */
 
 namespace Amadeus\Client\RequestOptions;
+
 use Amadeus\Client\Params\AuthParams;
 
 /**
diff --git a/src/Amadeus/Client/RequestOptions/SecuritySignOutOptions.php b/src/Amadeus/Client/RequestOptions/SecuritySignOutOptions.php
index df9657556..7805ac2bf 100644
--- a/src/Amadeus/Client/RequestOptions/SecuritySignOutOptions.php
+++ b/src/Amadeus/Client/RequestOptions/SecuritySignOutOptions.php
@@ -30,5 +30,4 @@
  */
 class SecuritySignOutOptions extends Base
 {
-
 }
diff --git a/src/Amadeus/Client/RequestOptions/Ticket/Pricing.php b/src/Amadeus/Client/RequestOptions/Ticket/Pricing.php
index eba3a182c..0ffe1d2ca 100644
--- a/src/Amadeus/Client/RequestOptions/Ticket/Pricing.php
+++ b/src/Amadeus/Client/RequestOptions/Ticket/Pricing.php
@@ -24,7 +24,6 @@
 
 use Amadeus\Client\LoadParamsFromArray;
 
-
 /**
  * Pricing
  *
diff --git a/src/Amadeus/Client/ResponseHandler/Base.php b/src/Amadeus/Client/ResponseHandler/Base.php
index 5e83417c6..eaff5cdf4 100644
--- a/src/Amadeus/Client/ResponseHandler/Base.php
+++ b/src/Amadeus/Client/ResponseHandler/Base.php
@@ -657,7 +657,7 @@ protected function analyzeGenericOfferResponse($response)
         $msgNode = $domXpath->query('//m:errorsDescription/m:errorWarningDescription/m:freeText')->item(0);
 
         if ($msgNode instanceof \DOMNode) {
-            if (trim($msgNode->nodeValue) === "OFFER CONFIRMED SUCCESSFULLY" || trim($msgNode->nodeValue) === "OFFER VERIFIED SUCCESSFULLY" ) {
+            if (trim($msgNode->nodeValue) === "OFFER CONFIRMED SUCCESSFULLY" || trim($msgNode->nodeValue) === "OFFER VERIFIED SUCCESSFULLY") {
                 $analyzeResponse->messages[] = new Result\NotOk(
                     0,
                     trim($msgNode->nodeValue)
@@ -915,7 +915,7 @@ protected function makeMessageFromMessagesNodeList($errorTextNodeList)
         return implode(
             ' - ',
             array_map(
-                function($item) {
+                function ($item) {
                     return trim($item->nodeValue);
                 },
                 iterator_to_array($errorTextNodeList)
diff --git a/src/Amadeus/Client/Session/Handler/Base.php b/src/Amadeus/Client/Session/Handler/Base.php
index 305d12afc..9b9353146 100644
--- a/src/Amadeus/Client/Session/Handler/Base.php
+++ b/src/Amadeus/Client/Session/Handler/Base.php
@@ -118,9 +118,9 @@ abstract class Base implements HandlerInterface, LoggerAwareInterface
      * @var array
      */
     protected $soapClientOptions = [
-        'trace' 		=> 1,
-        'exceptions' 	=> 1,
-        'soap_version' 	=> SOAP_1_1
+        'trace' => 1,
+        'exceptions' => 1,
+        'soap_version' => SOAP_1_1
     ];
 
     /**
@@ -289,7 +289,7 @@ public function sendMessage($messageName, Client\Struct\BaseWsMessage $messageBo
      * @param string $messageName
      * @param array $messageOptions
      */
-    protected abstract function prepareForNextMessage($messageName, $messageOptions);
+    abstract protected function prepareForNextMessage($messageName, $messageOptions);
 
     /**
      * Handles post message actions
@@ -301,7 +301,7 @@ protected abstract function prepareForNextMessage($messageName, $messageOptions)
      * @param array $messageOptions
      * @param mixed $result
      */
-    protected abstract function handlePostMessage($messageName, $lastResponse, $messageOptions, $result);
+    abstract protected function handlePostMessage($messageName, $lastResponse, $messageOptions, $result);
 
     /**
      * Get the last raw XML message that was sent out
@@ -547,7 +547,7 @@ protected function getSoapClient($msgName)
      * @param string $wsdlId
      * @return \SoapClient
      */
-    protected abstract function initSoapClient($wsdlId);
+    abstract protected function initSoapClient($wsdlId);
 
     /**
      * Get Messages & Versions from an imported WSDL file
diff --git a/src/Amadeus/Client/Session/Handler/InvalidSessionException.php b/src/Amadeus/Client/Session/Handler/InvalidSessionException.php
index 5e73ebb3b..5037fcdde 100644
--- a/src/Amadeus/Client/Session/Handler/InvalidSessionException.php
+++ b/src/Amadeus/Client/Session/Handler/InvalidSessionException.php
@@ -34,5 +34,4 @@
  */
 class InvalidSessionException extends Exception
 {
-
 }
diff --git a/src/Amadeus/Client/Session/Handler/SoapHeader4.php b/src/Amadeus/Client/Session/Handler/SoapHeader4.php
index 39c66d805..688f8220d 100644
--- a/src/Amadeus/Client/Session/Handler/SoapHeader4.php
+++ b/src/Amadeus/Client/Session/Handler/SoapHeader4.php
@@ -223,7 +223,7 @@ protected function createSoapHeaders($sessionData, $params, $messageName, $messa
             $password = base64_decode($params->authParams->passwordData);
             $creation = new \DateTime('now', new \DateTimeZone('UTC'));
             $t = microtime(true);
-            $micro = sprintf("%03d",($t - floor($t)) * 1000);
+            $micro = sprintf("%03d", ($t - floor($t)) * 1000);
             $creationString = $this->createDateTimeStringForAuth($creation, $micro);
             $messageNonce = $this->generateUniqueNonce($params->authParams->nonceBase, $creationString);
             $encodedNonce = base64_encode($messageNonce);
@@ -275,7 +275,7 @@ protected function createSoapHeaders($sessionData, $params, $messageName, $messa
                     )
                 )
             );
-        } else if ($stateful === true) {
+        } elseif ($stateful === true) {
             //We are authenticated and stateful: provide session header to continue or terminate session
             $statusCode =
                 (isset($messageOptions['endSession']) && $messageOptions['endSession'] === true) ?
@@ -354,9 +354,9 @@ protected function generateGuid()
 
             $uuid = substr($charId, 0, 8) . $hyphen
                 .substr($charId, 8, 4) . $hyphen
-                .substr($charId,12, 4) . $hyphen
-                .substr($charId,16, 4) . $hyphen
-                .substr($charId,20,12);
+                .substr($charId, 12, 4) . $hyphen
+                .substr($charId, 16, 4) . $hyphen
+                .substr($charId, 20, 12);
 
             return $uuid;
         }
diff --git a/src/Amadeus/Client/Session/Handler/UnsupportedOperationException.php b/src/Amadeus/Client/Session/Handler/UnsupportedOperationException.php
index 7a5a6f64b..6912ed7ee 100644
--- a/src/Amadeus/Client/Session/Handler/UnsupportedOperationException.php
+++ b/src/Amadeus/Client/Session/Handler/UnsupportedOperationException.php
@@ -36,5 +36,4 @@
  */
 class UnsupportedOperationException extends Exception
 {
-
 }
diff --git a/src/Amadeus/Client/SoapClient.php b/src/Amadeus/Client/SoapClient.php
index 2814c7c45..0dce7e622 100644
--- a/src/Amadeus/Client/SoapClient.php
+++ b/src/Amadeus/Client/SoapClient.php
@@ -73,11 +73,11 @@ public function __construct($wsdl, $options, Log\LoggerInterface $logger = null)
      */
     public function __doRequest($request, $location, $action, $version, $oneWay = null)
     {
-        if (!extension_loaded ('xsl')) {
+        if (!extension_loaded('xsl')) {
             throw new Exception('PHP XSL extension is not enabled.');
         }
 
-        $newRequest = $this->transformIncomingRequest( $request);
+        $newRequest = $this->transformIncomingRequest($request);
 
         return parent::__doRequest($newRequest, $location, $action, $version, $oneWay);
     }
diff --git a/src/Amadeus/Client/Struct/Air/FlightInfo.php b/src/Amadeus/Client/Struct/Air/FlightInfo.php
index 8d48c707c..646707c0a 100644
--- a/src/Amadeus/Client/Struct/Air/FlightInfo.php
+++ b/src/Amadeus/Client/Struct/Air/FlightInfo.php
@@ -21,6 +21,7 @@
  */
 
 namespace Amadeus\Client\Struct\Air;
+
 use Amadeus\Client\RequestOptions\AirFlightInfoOptions;
 use Amadeus\Client\Struct\BaseWsMessage;
 
diff --git a/src/Amadeus/Client/Struct/Air/GeneralFlightInfo.php b/src/Amadeus/Client/Struct/Air/GeneralFlightInfo.php
index 3ef825cf2..d75f24807 100644
--- a/src/Amadeus/Client/Struct/Air/GeneralFlightInfo.php
+++ b/src/Amadeus/Client/Struct/Air/GeneralFlightInfo.php
@@ -21,6 +21,7 @@
  */
 
 namespace Amadeus\Client\Struct\Air;
+
 use Amadeus\Client\RequestOptions\AirFlightInfoOptions;
 
 /**
diff --git a/src/Amadeus/Client/Struct/Air/MultiAvailability.php b/src/Amadeus/Client/Struct/Air/MultiAvailability.php
index f0e3e0013..284d8ef01 100644
--- a/src/Amadeus/Client/Struct/Air/MultiAvailability.php
+++ b/src/Amadeus/Client/Struct/Air/MultiAvailability.php
@@ -32,5 +32,4 @@
  */
 class MultiAvailability extends BaseWsMessage
 {
-
 }
diff --git a/src/Amadeus/Client/Struct/Air/OriginDestinationDetails.php b/src/Amadeus/Client/Struct/Air/OriginDestinationDetails.php
index 6edf7a501..e67a5b198 100644
--- a/src/Amadeus/Client/Struct/Air/OriginDestinationDetails.php
+++ b/src/Amadeus/Client/Struct/Air/OriginDestinationDetails.php
@@ -32,5 +32,4 @@
  */
 class OriginDestinationDetails extends AddMultiElementsOriginDestination
 {
-
 }
diff --git a/src/Amadeus/Client/Struct/Air/RetrieveSeatMap/FrequentTravelerInfo.php b/src/Amadeus/Client/Struct/Air/RetrieveSeatMap/FrequentTravelerInfo.php
index 30a09385c..58392be24 100644
--- a/src/Amadeus/Client/Struct/Air/RetrieveSeatMap/FrequentTravelerInfo.php
+++ b/src/Amadeus/Client/Struct/Air/RetrieveSeatMap/FrequentTravelerInfo.php
@@ -21,6 +21,7 @@
  */
 
 namespace Amadeus\Client\Struct\Air\RetrieveSeatMap;
+
 use Amadeus\Client\RequestOptions\Air\RetrieveSeatMap\FrequentFlyer;
 
 /**
diff --git a/src/Amadeus/Client/Struct/Air/RetrieveSeatMap/FrequentTravellerDetails.php b/src/Amadeus/Client/Struct/Air/RetrieveSeatMap/FrequentTravellerDetails.php
index a312aa104..6b4a31bbc 100644
--- a/src/Amadeus/Client/Struct/Air/RetrieveSeatMap/FrequentTravellerDetails.php
+++ b/src/Amadeus/Client/Struct/Air/RetrieveSeatMap/FrequentTravellerDetails.php
@@ -21,6 +21,7 @@
  */
 
 namespace Amadeus\Client\Struct\Air\RetrieveSeatMap;
+
 use Amadeus\Client\RequestOptions\Air\RetrieveSeatMap\FrequentFlyer;
 
 /**
diff --git a/src/Amadeus/Client/Struct/BaseWsMessage.php b/src/Amadeus/Client/Struct/BaseWsMessage.php
index 508acb44d..bf28efe73 100644
--- a/src/Amadeus/Client/Struct/BaseWsMessage.php
+++ b/src/Amadeus/Client/Struct/BaseWsMessage.php
@@ -30,5 +30,4 @@
  */
 class BaseWsMessage
 {
-
 }
diff --git a/src/Amadeus/Client/Struct/DocIssuance/OtherCompoundOptions.php b/src/Amadeus/Client/Struct/DocIssuance/OtherCompoundOptions.php
index f7cd556ab..a25747d85 100644
--- a/src/Amadeus/Client/Struct/DocIssuance/OtherCompoundOptions.php
+++ b/src/Amadeus/Client/Struct/DocIssuance/OtherCompoundOptions.php
@@ -30,5 +30,4 @@
  */
 class OtherCompoundOptions
 {
-
 }
diff --git a/src/Amadeus/Client/Struct/DocIssuance/Stock.php b/src/Amadeus/Client/Struct/DocIssuance/Stock.php
index 0135214b1..ee1788784 100644
--- a/src/Amadeus/Client/Struct/DocIssuance/Stock.php
+++ b/src/Amadeus/Client/Struct/DocIssuance/Stock.php
@@ -30,5 +30,4 @@
  */
 class Stock
 {
-
 }
diff --git a/src/Amadeus/Client/Struct/Fare/ConvertCurrency.php b/src/Amadeus/Client/Struct/Fare/ConvertCurrency.php
index 782035fd9..efafbaea2 100644
--- a/src/Amadeus/Client/Struct/Fare/ConvertCurrency.php
+++ b/src/Amadeus/Client/Struct/Fare/ConvertCurrency.php
@@ -60,7 +60,7 @@ class ConvertCurrency extends BaseWsMessage
      *
      * @param FareConvertCurrencyOptions $params
      */
-    public function __construct (FareConvertCurrencyOptions $params)
+    public function __construct(FareConvertCurrencyOptions $params)
     {
         $this->message = new MsgType(MessageFunctionDetails::FARE_CURRENCY_CONVERSION);
 
diff --git a/src/Amadeus/Client/Struct/Fare/ConvertCurrency/AmountInfo.php b/src/Amadeus/Client/Struct/Fare/ConvertCurrency/AmountInfo.php
index 52dce0f38..276869bc9 100644
--- a/src/Amadeus/Client/Struct/Fare/ConvertCurrency/AmountInfo.php
+++ b/src/Amadeus/Client/Struct/Fare/ConvertCurrency/AmountInfo.php
@@ -42,6 +42,6 @@ class AmountInfo
      */
     public function __construct($amount)
     {
-       $this->monetaryDetails[] = new MonetaryDetails($amount);
+        $this->monetaryDetails[] = new MonetaryDetails($amount);
     }
 }
diff --git a/src/Amadeus/Client/Struct/Fare/InformativePricingWithoutPNR13.php b/src/Amadeus/Client/Struct/Fare/InformativePricingWithoutPNR13.php
index f30c38aaf..44bacc64f 100644
--- a/src/Amadeus/Client/Struct/Fare/InformativePricingWithoutPNR13.php
+++ b/src/Amadeus/Client/Struct/Fare/InformativePricingWithoutPNR13.php
@@ -72,7 +72,6 @@ public function __construct(FareInformativePricingWithoutPnrOptions $options)
         $this->loadSegments($options->segments);
 
         $this->loadPricingOptions($options->pricingOptions);
-
     }
 
     /**
diff --git a/src/Amadeus/Client/Struct/Fare/MasterPricer/PricingTickInfo.php b/src/Amadeus/Client/Struct/Fare/MasterPricer/PricingTickInfo.php
index 4de30347b..8ac02d311 100644
--- a/src/Amadeus/Client/Struct/Fare/MasterPricer/PricingTickInfo.php
+++ b/src/Amadeus/Client/Struct/Fare/MasterPricer/PricingTickInfo.php
@@ -46,5 +46,4 @@ class PricingTickInfo
     public $journeyOriginPoint;
 
     public $corporateId;
-
 }
diff --git a/src/Amadeus/Client/Struct/Fare/MasterPricer/PricingTicketing.php b/src/Amadeus/Client/Struct/Fare/MasterPricer/PricingTicketing.php
index 3a491a1fd..700cef770 100644
--- a/src/Amadeus/Client/Struct/Fare/MasterPricer/PricingTicketing.php
+++ b/src/Amadeus/Client/Struct/Fare/MasterPricer/PricingTicketing.php
@@ -33,7 +33,7 @@ class PricingTicketing
     const PRICETYPE_TICKETABILITY_PRECHECK = 'TAC';
     const PRICETYPE_UNIFARES = 'RU';
     const PRICETYPE_PUBLICFARES = 'RP';
-	const PRICETYPE_CORPORATE_UNIFARES = 'RW';
+    const PRICETYPE_CORPORATE_UNIFARES = 'RW';
 
     /**
      * self::PRICETYPE_*
diff --git a/src/Amadeus/Client/Struct/Fare/PricePnr12/ValidatingCarrier.php b/src/Amadeus/Client/Struct/Fare/PricePnr12/ValidatingCarrier.php
index 414d9b38e..cd5540cc8 100644
--- a/src/Amadeus/Client/Struct/Fare/PricePnr12/ValidatingCarrier.php
+++ b/src/Amadeus/Client/Struct/Fare/PricePnr12/ValidatingCarrier.php
@@ -44,5 +44,4 @@ public function __construct($carrierCode)
     {
         $this->carrierInformation = new CarrierInformation($carrierCode);
     }
-
 }
diff --git a/src/Amadeus/Client/Struct/Fare/PricePnr13/DateInformation.php b/src/Amadeus/Client/Struct/Fare/PricePnr13/DateInformation.php
index 3160682ab..07afd01ec 100644
--- a/src/Amadeus/Client/Struct/Fare/PricePnr13/DateInformation.php
+++ b/src/Amadeus/Client/Struct/Fare/PricePnr13/DateInformation.php
@@ -30,5 +30,4 @@
  */
 class DateInformation
 {
-
 }
diff --git a/src/Amadeus/Client/Struct/Fare/PricePnr13/FormOfPaymentInformation.php b/src/Amadeus/Client/Struct/Fare/PricePnr13/FormOfPaymentInformation.php
index 4a4b349f2..820c56e0b 100644
--- a/src/Amadeus/Client/Struct/Fare/PricePnr13/FormOfPaymentInformation.php
+++ b/src/Amadeus/Client/Struct/Fare/PricePnr13/FormOfPaymentInformation.php
@@ -30,5 +30,4 @@
  */
 class FormOfPaymentInformation
 {
-
 }
diff --git a/src/Amadeus/Client/Struct/Fare/PricePnr13/FrequentFlyerInformation.php b/src/Amadeus/Client/Struct/Fare/PricePnr13/FrequentFlyerInformation.php
index 6e7bcfb3c..f2306e78a 100644
--- a/src/Amadeus/Client/Struct/Fare/PricePnr13/FrequentFlyerInformation.php
+++ b/src/Amadeus/Client/Struct/Fare/PricePnr13/FrequentFlyerInformation.php
@@ -30,5 +30,4 @@
  */
 class FrequentFlyerInformation
 {
-
 }
diff --git a/src/Amadeus/Client/Struct/Fare/PricePnr13/LocationInformation.php b/src/Amadeus/Client/Struct/Fare/PricePnr13/LocationInformation.php
index 2e3c848f1..9aa4be9a7 100644
--- a/src/Amadeus/Client/Struct/Fare/PricePnr13/LocationInformation.php
+++ b/src/Amadeus/Client/Struct/Fare/PricePnr13/LocationInformation.php
@@ -30,5 +30,4 @@
  */
 class LocationInformation
 {
-
 }
diff --git a/src/Amadeus/Client/Struct/Fare/PricePnr13/MonetaryInformation.php b/src/Amadeus/Client/Struct/Fare/PricePnr13/MonetaryInformation.php
index 54ec5b105..4bc460425 100644
--- a/src/Amadeus/Client/Struct/Fare/PricePnr13/MonetaryInformation.php
+++ b/src/Amadeus/Client/Struct/Fare/PricePnr13/MonetaryInformation.php
@@ -30,5 +30,4 @@
  */
 class MonetaryInformation
 {
-
 }
diff --git a/src/Amadeus/Client/Struct/Fare/PricePnr13/TaxInformation.php b/src/Amadeus/Client/Struct/Fare/PricePnr13/TaxInformation.php
index 3c10cd0af..bebe61602 100644
--- a/src/Amadeus/Client/Struct/Fare/PricePnr13/TaxInformation.php
+++ b/src/Amadeus/Client/Struct/Fare/PricePnr13/TaxInformation.php
@@ -30,5 +30,4 @@
  */
 class TaxInformation
 {
-
 }
diff --git a/src/Amadeus/Client/Struct/HeaderV4/Password.php b/src/Amadeus/Client/Struct/HeaderV4/Password.php
index 2a5c7b927..6b539e66b 100644
--- a/src/Amadeus/Client/Struct/HeaderV4/Password.php
+++ b/src/Amadeus/Client/Struct/HeaderV4/Password.php
@@ -31,6 +31,7 @@
 class Password
 {
     public $_;
+
     public $Type;
 
     /**
@@ -41,4 +42,4 @@ public function __construct($paramValue)
         $this->_ = $paramValue;
         $this->Type = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest';
     }
-}
\ No newline at end of file
+}
diff --git a/src/Amadeus/Client/Struct/HeaderV4/UsernameToken.php b/src/Amadeus/Client/Struct/HeaderV4/UsernameToken.php
index 1863487ba..7a99ea282 100644
--- a/src/Amadeus/Client/Struct/HeaderV4/UsernameToken.php
+++ b/src/Amadeus/Client/Struct/HeaderV4/UsernameToken.php
@@ -69,5 +69,4 @@ public function __construct($userName, $password, $nonce, $created, $ns)
 
         $this->Created = new \SoapVar($created, XSD_STRING, null, null, 'Created', $ns);
     }
-
 }
diff --git a/src/Amadeus/Client/Struct/InvalidArgumentException.php b/src/Amadeus/Client/Struct/InvalidArgumentException.php
index 285004666..3a64480f3 100644
--- a/src/Amadeus/Client/Struct/InvalidArgumentException.php
+++ b/src/Amadeus/Client/Struct/InvalidArgumentException.php
@@ -37,5 +37,4 @@
  */
 class InvalidArgumentException extends \InvalidArgumentException
 {
-
 }
diff --git a/src/Amadeus/Client/Struct/Offer/ConfirmHotel/CcInfo.php b/src/Amadeus/Client/Struct/Offer/ConfirmHotel/CcInfo.php
index 26ba4f5ca..07a1932e1 100644
--- a/src/Amadeus/Client/Struct/Offer/ConfirmHotel/CcInfo.php
+++ b/src/Amadeus/Client/Struct/Offer/ConfirmHotel/CcInfo.php
@@ -71,6 +71,5 @@ public function __construct($vendor, $name, $number, $expiry, $secId = null)
         $this->cardNumber = $number;
         $this->expiryDate = $expiry;
         $this->securityId = $secId;
-
     }
 }
diff --git a/src/Amadeus/Client/Struct/Offer/ConfirmHotel/RoomList.php b/src/Amadeus/Client/Struct/Offer/ConfirmHotel/RoomList.php
index 531d2f7b7..820a781af 100644
--- a/src/Amadeus/Client/Struct/Offer/ConfirmHotel/RoomList.php
+++ b/src/Amadeus/Client/Struct/Offer/ConfirmHotel/RoomList.php
@@ -66,6 +66,5 @@ class RoomList
      */
     public function __construct()
     {
-
     }
 }
diff --git a/src/Amadeus/Client/Struct/Offer/PassengerReassociation.php b/src/Amadeus/Client/Struct/Offer/PassengerReassociation.php
index ad0fa9757..d55e1cb5a 100644
--- a/src/Amadeus/Client/Struct/Offer/PassengerReassociation.php
+++ b/src/Amadeus/Client/Struct/Offer/PassengerReassociation.php
@@ -42,7 +42,6 @@ class PassengerReassociation
      */
     public $paxReference;
 
-
     /**
      * @param string|null $pricingRef
      * @param PassengerDef[]|null $paxRefs
@@ -57,4 +56,4 @@ public function __construct($pricingRef = null, $paxRefs = null)
             $this->paxReference = new PaxReference($paxRefs);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Amadeus/Client/Struct/Pnr/AddMultiElements.php b/src/Amadeus/Client/Struct/Pnr/AddMultiElements.php
index cbd1f7670..1e3844167 100644
--- a/src/Amadeus/Client/Struct/Pnr/AddMultiElements.php
+++ b/src/Amadeus/Client/Struct/Pnr/AddMultiElements.php
@@ -100,7 +100,7 @@ public function __construct(PnrAddMultiElementsBase $params = null)
         if (!is_null($params)) {
             if ($params instanceof PnrCreatePnrOptions) {
                 $this->loadCreatePnr($params);
-            } else if ($params instanceof PnrAddMultiElementsOptions) {
+            } elseif ($params instanceof PnrAddMultiElementsOptions) {
                 $this->loadBare($params);
             }
         }
diff --git a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/Address.php b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/Address.php
index b822428d0..a217d2b00 100644
--- a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/Address.php
+++ b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/Address.php
@@ -60,6 +60,6 @@ class Address
      */
     public function __construct($addressLineOne)
     {
-       $this->optionTextA1 = $addressLineOne;
+        $this->optionTextA1 = $addressLineOne;
     }
 }
diff --git a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/AirAuxItinerary.php b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/AirAuxItinerary.php
index 48e16fd33..55162199a 100644
--- a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/AirAuxItinerary.php
+++ b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/AirAuxItinerary.php
@@ -62,7 +62,7 @@ class AirAuxItinerary
      */
     public function __construct($segmentType, $segmentContent)
     {
-        switch($segmentType) {
+        switch ($segmentType) {
             case 'Miscellaneous':
                 $this->loadMiscellaneous($segmentContent);
                 break;
diff --git a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/ElementManagementItinerary.php b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/ElementManagementItinerary.php
index ecb568c37..b505dd54f 100644
--- a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/ElementManagementItinerary.php
+++ b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/ElementManagementItinerary.php
@@ -24,7 +24,7 @@
 
 /**
  * ElementManagementItinerary
- * 
+ *
  * @package Amadeus\Client\Struct\Pnr\AddMultiElements
  * @author Dieter Devlieghere <dieter.devlieghere@benelux.amadeus.com>
  */
diff --git a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/FlightTypeDetails.php b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/FlightTypeDetails.php
index 54f5b0eb1..887b4dcaa 100644
--- a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/FlightTypeDetails.php
+++ b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/FlightTypeDetails.php
@@ -40,5 +40,4 @@ class FlightTypeDetails
      * @var string
      */
     public $flightIndicator;
-
 }
diff --git a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/FreetextItinerary.php b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/FreetextItinerary.php
index 2f7d6f580..c53d08b22 100644
--- a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/FreetextItinerary.php
+++ b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/FreetextItinerary.php
@@ -24,7 +24,7 @@
 
 /**
  * FreetextItinerary
- * 
+ *
  * @package Amadeus\Client\Struct\Pnr\AddMultiElements
  * @author Dieter Devlieghere <dieter.devlieghere@benelux.amadeus.com>
  */
diff --git a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/ItineraryInfo.php b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/ItineraryInfo.php
index a320243ac..0badc92ad 100644
--- a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/ItineraryInfo.php
+++ b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/ItineraryInfo.php
@@ -24,7 +24,7 @@
 
 /**
  * ItineraryInfo
- * 
+ *
  * @package Amadeus\Client\Struct\Pnr\AddMultiElements
  * @author Dieter Devlieghere <dieter.devlieghere@benelux.amadeus.com>
  */
diff --git a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/MessageAction.php b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/MessageAction.php
index 1ced3dcf7..9cc1db478 100644
--- a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/MessageAction.php
+++ b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/MessageAction.php
@@ -24,7 +24,7 @@
 
 /**
  * MessageAction
- * 
+ *
  * @package Amadeus\Client\Struct\Pnr\AddMultiElements
  * @author Dieter Devlieghere <dieter.devlieghere@benelux.amadeus.com>
  */
diff --git a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/OriginDestination.php b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/OriginDestination.php
index 1c94974d8..0ad4be523 100644
--- a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/OriginDestination.php
+++ b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/OriginDestination.php
@@ -24,7 +24,7 @@
 
 /**
  * OriginDestination
- * 
+ *
  * @package Amadeus\Client\Struct\Pnr\AddMultiElements
  * @author Dieter Devlieghere <dieter.devlieghere@benelux.amadeus.com>
  */
@@ -33,6 +33,7 @@ class OriginDestination
     const LOCATION_ARNK = "ARNK";
 
     const LOCATION_ALL = "ZZZ";
+
     /**
      * @var string
      */
diff --git a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/OriginDestinationDetails.php b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/OriginDestinationDetails.php
index 9cbb51826..1709d6ef1 100644
--- a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/OriginDestinationDetails.php
+++ b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/OriginDestinationDetails.php
@@ -24,7 +24,7 @@
 
 /**
  * OriginDestinationDetails
- * 
+ *
  * @package Amadeus\Client\Struct\Pnr\AddMultiElements
  * @author Dieter Devlieghere <dieter.devlieghere@benelux.amadeus.com>
  */
diff --git a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/Passenger.php b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/Passenger.php
index d1802c8fc..d6f2b8eed 100644
--- a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/Passenger.php
+++ b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/Passenger.php
@@ -30,227 +30,227 @@
  */
 class Passenger
 {
-	const PASST_ADULT = "ADT";
-	const PASST_INFANT = "INF";
-	const PASST_CHILD = "CHD";
+    const PASST_ADULT = "ADT";
+    const PASST_INFANT = "INF";
+    const PASST_CHILD = "CHD";
 
     /**
      * 1: Infant (INF) No more info in Edifact.
      */
-	const INF_NOINFO = 1;
+    const INF_NOINFO = 1;
     /**
      * 2: Infant given name only (INF/BILL) Infant given name will be placed
      * in a 2nd occurence of C324 of this (adult) passenger TIF.
      * The 2nd C324/6353 element will contain INF.
      */
-	const INF_GIVEN = 2;
+    const INF_GIVEN = 2;
     /**
      * 3: Infant given and last name (INFGATES/BILL) Infant is treated as a
      * separate TIF following immediately this (adult) passenger TIF.
      * This following TIF C324/6353 element will contain INF.
      */
-	const INF_FULL = 3;
+    const INF_FULL = 3;
 
     /**
      * @var string
      */
-	public $firstName;
-	
-	/*
-	 * self::PASST_*
-	 *
-	 * Passenger Types: 
-	 * 766 	Infant without seat
-	 * 767 	Infant with seat
-	 * A00 	Companion
-	 * ACC 	Accompanied Person
-	 * ACP 	Test data
-	 * ADT 	Adult
-	 * AGT 	Agent
-	 * ASB 	Adult Standby
-	 * ASF 	Air-Sea Fare
-	 * BAG 	Excess Baggage
-	 * BKB 	Bookable Staff Travel
-	 * BLD 	Blind Passenger
-	 * BRV 	Bereavement
-	 * BUD 	Airline Buddy Standby Fare
-	 * C 	CBBG - Cabin Baggage
-	 * C00 	Accompanied Child
-	 * CBC 	(no description)
-	 * CBI 	(no description)
-	 * CHD 	Child
-	 * CLG 	Clergy
-	 * CMA 	Adult with Companion
-	 * CMM 	Commuter
-	 * CMP 	Companion
-	 * CMX 	ANN - CMP - CMA - Blended
-	 * CNE 	(no description)
-	 * CNV 	Convention
-	 * COR 	CORPORATE NAME
-	 * CPN 	Coupon discount PSGR
-	 * CTZ 	Category Z PSGR
-	 * DOD 	DEPT of Defense PSGR
-	 * E 	EXST - Extra Seat
-	 * E00 	Group Inclusive tour Child
-	 * ECH 	(no description)
-	 * EDT 	(no description)
-	 * EMI 	Emigrant
-	 * ENF 	(no description)
-	 * EPA 	(no description)
-	 * EPC 	(no description)
-	 * EPI 	(no description)
-	 * F00 	Family Plan Child
-	 * FDT 	Head of Family
-	 * FFY 	Frequent Flyer
-	 * FIF 	(no description)
-	 * FTF 	Frequent Flyer
-	 * G 	Group
-	 * G00 	Group Child
-	 * GCF 	Government Contract.
-	 * GCT 	City/Council Government PSGR
-	 * GDP 	Government Employee Dependent
-	 * GEX 	Government Exchange PSGR
-	 * GGZ 	(no description)
-	 * GIT 	Group Inclusive Tour PSGR
-	 * GMZ 	GOV / CT / MIL / CATZ
-	 * GOV 	GVT Blended
-	 * GRP 	Group Passenger
-	 * GST 	State Government
-	 * GTF 	Goverment Travel
-	 * GVM 	GOV / GOVCT / CATZ
-	 * GVT 	Government Travel
-	 * GVZ 	Government / GOVCT / CATZ
-	 * H00 	Children Charter
-	 * HCR 	Adult Charter
-	 * HOF 	Head of Family
-	 * I00 	Individual Inclusive Tour Child
-	 * ICP 	Incentive Certificates
-	 * IIT 	Individual Inclusive Tour PSGR
-	 * INE 	(no description)
-	 * INF 	Infant not Occupying a Seat
-	 * INS 	Infant Occupying a Seat
-	 * INY 	(no description)
-	 * ITX 	Individual Inclusive Tour PSGR
-	 * J00 	(no description)
-	 * JCB 	(no description)
-	 * JNF 	(no description)
-	 * JNS 	(no description)
-	 * JOB 	Job Corps
-	 * LBR 	Laborer / Worker
-	 * LUV 	(no description)
-	 * M00 	Military Child
-	 * MBT 	Military - basic Training Graduate
-	 * MCR 	Military Charter
-	 * MDP 	Spouse and Dependent Children of Military Personnel
-	 * MED 	Patients Travel for Medical treatment
-	 * MFM 	Military Immediate family
-	 * MIL 	Military Confirmed passenger
-	 * MIR 	Military Reserve on Active Duty
-	 * MIS 	Missionary.
-	 * MLZ 	Military / Cat. Z
-	 * MPA 	Military parents/Parents in Law
-	 * MRE 	Retired military and Dependent
-	 * MSB 	Military Standby
-	 * MSG 	Multi State Government
-	 * MTH 	Month
-	 * MUS 	Military DOD based in Usa
-	 * MXS 	Military DOD not based in USA
-	 * NAT 	NATO
-	 * NSB 	Non Revenue Standby
-	 * NTL 	(no description)
-	 * OTS 	PSGR occupying two Seats
-	 * P00 	Children Charter
-	 * PAX 	Passenger
-	 * PCA 	(no description)
-	 * PCB 	(no description)
-	 * PCR 	Adult Charter
-	 * PFA 	Private Fare
-	 * PFB 	Private Fare
-	 * PFC 	Private Fare
-	 * PFD 	Private Fare
-	 * PFE 	Private Fare
-	 * PFF 	Private Fare
-	 * PFG 	Private Fare
-	 * PFH 	Private Fare
-	 * PFI 	Private Fare
-	 * PFJ 	Private Fare
-	 * PFK 	Private Fare
-	 * PFL 	Private Fare
-	 * PFM 	Private Fare
-	 * PFN 	Private Fare
-	 * PFO 	Private Fare
-	 * PFP 	Private Fare
-	 * PFQ 	Private Fare
-	 * PFR 	Private Fare
-	 * PFS 	Private Fare
-	 * PFT 	Private Fare
-	 * PFU 	Private Fare
-	 * PFV 	Private Fare
-	 * PFW 	Private Fare
-	 * PFX 	Private Fare
-	 * PFY 	Private Fare
-	 * PFZ 	Private Fare
-	 * PIF 	(no description)
-	 * PIL 	(no description)
-	 * PSP 	(no description)
-	 * PST 	(no description)
-	 * REC 	Military Recruit
-	 * REF 	Refugee
-	 * S00 	Senior Citizen
-	 * SBY 	Standby Staff Travel
-	 * SDB 	Student Standby
-	 * SEA 	Seaman
-	 * SPS 	Spouse
-	 * SRC 	Senior Citizen
-	 * STR 	State Resident
-	 * STU 	Student
-	 * T00 	Frequent Flyer Child
-	 * TIM 	(no description)
-	 * TUR 	Tour Conductor
-	 * U00 	Unaccompanied Child
-	 * UAM 	Unaccompanied Minor
-	 * UDA 	(no description)
-	 * UDN 	(no description)
-	 * UNV 	University Employee
-	 * V00 	Visit Another Country Child
-	 * VAC 	Visit Another Country Adult
-	 * VAG 	Group Visit Another Country Adult
-	 * VFR 	Visit friends Relatives
-	 * WCR 	(no description)
-	 * WEB 	(no description)
-	 * Y00 	Government Travel Child
-	 * YCB 	Senior Citizen Standby
-	 * YCD 	Senior Citizen
-	 * YCL 	Clergy
-	 * YCR 	Youth Charter
-	 * YMZ 	Category Z passenger
-	 * YRS 	Year
-	 * YSB 	Youth Standby
-	 * YTH 	Youth Confirmed
-	 * Z00 	Group Visit Another Country,Child
-	 *
-	 * @var string
-	*/
-	public $type;
-	
-	/*
-	 * self::INF_*
-	 *
-	 * @var string|int
-	 */
-	public $infantIndicator;
+    public $firstName;
+    
+    /*
+     * self::PASST_*
+     *
+     * Passenger Types: 
+     * 766     Infant without seat
+     * 767     Infant with seat
+     * A00     Companion
+     * ACC     Accompanied Person
+     * ACP     Test data
+     * ADT     Adult
+     * AGT     Agent
+     * ASB     Adult Standby
+     * ASF     Air-Sea Fare
+     * BAG     Excess Baggage
+     * BKB     Bookable Staff Travel
+     * BLD     Blind Passenger
+     * BRV     Bereavement
+     * BUD     Airline Buddy Standby Fare
+     * C       CBBG - Cabin Baggage
+     * C00     Accompanied Child
+     * CBC     (no description)
+     * CBI     (no description)
+     * CHD     Child
+     * CLG     Clergy
+     * CMA     Adult with Companion
+     * CMM     Commuter
+     * CMP     Companion
+     * CMX     ANN - CMP - CMA - Blended
+     * CNE     (no description)
+     * CNV     Convention
+     * COR     CORPORATE NAME
+     * CPN     Coupon discount PSGR
+     * CTZ     Category Z PSGR
+     * DOD     DEPT of Defense PSGR
+     * E       EXST - Extra Seat
+     * E00     Group Inclusive tour Child
+     * ECH     (no description)
+     * EDT     (no description)
+     * EMI     Emigrant
+     * ENF     (no description)
+     * EPA     (no description)
+     * EPC     (no description)
+     * EPI     (no description)
+     * F00     Family Plan Child
+     * FDT     Head of Family
+     * FFY     Frequent Flyer
+     * FIF     (no description)
+     * FTF     Frequent Flyer
+     * G       Group
+     * G00     Group Child
+     * GCF     Government Contract.
+     * GCT     City/Council Government PSGR
+     * GDP     Government Employee Dependent
+     * GEX     Government Exchange PSGR
+     * GGZ     (no description)
+     * GIT     Group Inclusive Tour PSGR
+     * GMZ     GOV / CT / MIL / CATZ
+     * GOV     GVT Blended
+     * GRP     Group Passenger
+     * GST     State Government
+     * GTF     Goverment Travel
+     * GVM     GOV / GOVCT / CATZ
+     * GVT     Government Travel
+     * GVZ     Government / GOVCT / CATZ
+     * H00     Children Charter
+     * HCR     Adult Charter
+     * HOF     Head of Family
+     * I00     Individual Inclusive Tour Child
+     * ICP     Incentive Certificates
+     * IIT     Individual Inclusive Tour PSGR
+     * INE     (no description)
+     * INF     Infant not Occupying a Seat
+     * INS     Infant Occupying a Seat
+     * INY     (no description)
+     * ITX     Individual Inclusive Tour PSGR
+     * J00     (no description)
+     * JCB     (no description)
+     * JNF     (no description)
+     * JNS     (no description)
+     * JOB     Job Corps
+     * LBR     Laborer / Worker
+     * LUV     (no description)
+     * M00     Military Child
+     * MBT     Military - basic Training Graduate
+     * MCR     Military Charter
+     * MDP     Spouse and Dependent Children of Military Personnel
+     * MED     Patients Travel for Medical treatment
+     * MFM     Military Immediate family
+     * MIL     Military Confirmed passenger
+     * MIR     Military Reserve on Active Duty
+     * MIS     Missionary.
+     * MLZ     Military / Cat. Z
+     * MPA     Military parents/Parents in Law
+     * MRE     Retired military and Dependent
+     * MSB     Military Standby
+     * MSG     Multi State Government
+     * MTH     Month
+     * MUS     Military DOD based in Usa
+     * MXS     Military DOD not based in USA
+     * NAT     NATO
+     * NSB     Non Revenue Standby
+     * NTL     (no description)
+     * OTS     PSGR occupying two Seats
+     * P00     Children Charter
+     * PAX     Passenger
+     * PCA     (no description)
+     * PCB     (no description)
+     * PCR     Adult Charter
+     * PFA     Private Fare
+     * PFB     Private Fare
+     * PFC     Private Fare
+     * PFD     Private Fare
+     * PFE     Private Fare
+     * PFF     Private Fare
+     * PFG     Private Fare
+     * PFH     Private Fare
+     * PFI     Private Fare
+     * PFJ     Private Fare
+     * PFK     Private Fare
+     * PFL     Private Fare
+     * PFM     Private Fare
+     * PFN     Private Fare
+     * PFO     Private Fare
+     * PFP     Private Fare
+     * PFQ     Private Fare
+     * PFR     Private Fare
+     * PFS     Private Fare
+     * PFT     Private Fare
+     * PFU     Private Fare
+     * PFV     Private Fare
+     * PFW     Private Fare
+     * PFX     Private Fare
+     * PFY     Private Fare
+     * PFZ     Private Fare
+     * PIF     (no description)
+     * PIL     (no description)
+     * PSP     (no description)
+     * PST     (no description)
+     * REC     Military Recruit
+     * REF     Refugee
+     * S00     Senior Citizen
+     * SBY     Standby Staff Travel
+     * SDB     Student Standby
+     * SEA     Seaman
+     * SPS     Spouse
+     * SRC     Senior Citizen
+     * STR     State Resident
+     * STU     Student
+     * T00     Frequent Flyer Child
+     * TIM     (no description)
+     * TUR     Tour Conductor
+     * U00     Unaccompanied Child
+     * UAM     Unaccompanied Minor
+     * UDA     (no description)
+     * UDN     (no description)
+     * UNV     University Employee
+     * V00     Visit Another Country Child
+     * VAC     Visit Another Country Adult
+     * VAG     Group Visit Another Country Adult
+     * VFR     Visit friends Relatives
+     * WCR     (no description)
+     * WEB     (no description)
+     * Y00     Government Travel Child
+     * YCB     Senior Citizen Standby
+     * YCD     Senior Citizen
+     * YCL     Clergy
+     * YCR     Youth Charter
+     * YMZ     Category Z passenger
+     * YRS     Year
+     * YSB     Youth Standby
+     * YTH     Youth Confirmed
+     * Z00     Group Visit Another Country,Child
+     *
+     * @var string
+    */
+    public $type;
+    
+    /*
+     * self::INF_*
+     *
+     * @var string|int
+     */
+    public $infantIndicator;
 
     /**
      * @var string
      */
-	public $identificationCode;
+    public $identificationCode;
 
     /**
      * Passenger constructor.
      * @param $firstName
      * @param $type
      */
-	public function __construct($firstName, $type)
+    public function __construct($firstName, $type)
     {
         $this->firstName = $firstName;
         $this->type = $type;
diff --git a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/PassengerData.php b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/PassengerData.php
index 65b36da97..d7fea18af 100644
--- a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/PassengerData.php
+++ b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/PassengerData.php
@@ -30,20 +30,20 @@
  */
 class PassengerData
 {
-	/**
-	 * @var TravellerInformation
-	 */
-	public $travellerInformation;
-	/**
-	 * @var DateOfBirth
-	 */
-	public $dateOfBirth;
-	
-	/**
-	 * @param string $mainPassengerSurname
-	 */
-	public function __construct($mainPassengerSurname)
-	{
-		$this->travellerInformation = new TravellerInformation($mainPassengerSurname);
-	}
+    /**
+     * @var TravellerInformation
+     */
+    public $travellerInformation;
+    /**
+     * @var DateOfBirth
+     */
+    public $dateOfBirth;
+    
+    /**
+     * @param string $mainPassengerSurname
+     */
+    public function __construct($mainPassengerSurname)
+    {
+        $this->travellerInformation = new TravellerInformation($mainPassengerSurname);
+    }
 }
diff --git a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/RelatedProduct.php b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/RelatedProduct.php
index f102a165d..58f51c91d 100644
--- a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/RelatedProduct.php
+++ b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/RelatedProduct.php
@@ -24,7 +24,7 @@
 
 /**
  * RelatedProduct
- * 
+ *
  * @package Amadeus\Client\Struct\Pnr\AddMultiElements
  * @author Dieter Devlieghere <dieter.devlieghere@benelux.amadeus.com>
  */
diff --git a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/ReservationInfo.php b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/ReservationInfo.php
index 8547aae7d..904dbd86c 100644
--- a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/ReservationInfo.php
+++ b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/ReservationInfo.php
@@ -30,5 +30,4 @@
  */
 class ReservationInfo extends \Amadeus\Client\Struct\Pnr\ReservationInfo
 {
-
 }
diff --git a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/TravelProduct.php b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/TravelProduct.php
index 312904c99..1039897a6 100644
--- a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/TravelProduct.php
+++ b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/TravelProduct.php
@@ -24,7 +24,7 @@
 
 /**
  * TravelProduct
- * 
+ *
  * @package Amadeus\Client\Struct\Pnr\AddMultiElements
  * @author Dieter Devlieghere <dieter.devlieghere@benelux.amadeus.com>
  */
diff --git a/src/Amadeus/Client/Struct/Pnr/Reservation.php b/src/Amadeus/Client/Struct/Pnr/Reservation.php
index 28a4466c4..70eb64395 100644
--- a/src/Amadeus/Client/Struct/Pnr/Reservation.php
+++ b/src/Amadeus/Client/Struct/Pnr/Reservation.php
@@ -47,4 +47,4 @@ public function __construct($recordLocator = null)
     {
         $this->controlNumber = $recordLocator;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Amadeus/Client/Struct/Pnr/Retrieve.php b/src/Amadeus/Client/Struct/Pnr/Retrieve.php
index 94b21dcea..fceb680cf 100644
--- a/src/Amadeus/Client/Struct/Pnr/Retrieve.php
+++ b/src/Amadeus/Client/Struct/Pnr/Retrieve.php
@@ -32,35 +32,35 @@
  */
 class Retrieve extends BaseWsMessage
 {
-	/**
-	 * Definition for retrieval type: by record locator
-	 * 
-	 * see Amadeus Core Webservices documentation 
-	 * [Retrieval type, coded codesets (Ref: 109P 1A 00.1.1)]
-	 * @var int
-	 */
-	const RETR_TYPE_BY_RECLOC = 2;
-	
-	/**
-	 * @var Retrieve\Settings
-	 */
-	public $settings;
-	/**
-	 * @var Retrieve\RetrievalFacts
-	 */
-	public $retrievalFacts;
-	
-	/**
-	 * Construct PNR_Retrieve message
-	 * 
-	 * @param int $retrievalType
-	 * @param string|null $recordLocator (OPTIONAL)
-	 */
-	public function __construct($retrievalType = self::RETR_TYPE_BY_RECLOC, $recordLocator = null)
-	{
-		$this->retrievalFacts = new Retrieve\RetrievalFacts(
-			$retrievalType, 
-			$recordLocator
-		);
-	}
+    /**
+     * Definition for retrieval type: by record locator
+     * 
+     * see Amadeus Core Webservices documentation 
+     * [Retrieval type, coded codesets (Ref: 109P 1A 00.1.1)]
+     * @var int
+     */
+    const RETR_TYPE_BY_RECLOC = 2;
+    
+    /**
+     * @var Retrieve\Settings
+     */
+    public $settings;
+    /**
+     * @var Retrieve\RetrievalFacts
+     */
+    public $retrievalFacts;
+    
+    /**
+     * Construct PNR_Retrieve message
+     * 
+     * @param int $retrievalType
+     * @param string|null $recordLocator (OPTIONAL)
+     */
+    public function __construct($retrievalType = self::RETR_TYPE_BY_RECLOC, $recordLocator = null)
+    {
+        $this->retrievalFacts = new Retrieve\RetrievalFacts(
+            $retrievalType, 
+            $recordLocator
+        );
+    }
 }
diff --git a/src/Amadeus/Client/Struct/Pnr/Retrieve/Reservation.php b/src/Amadeus/Client/Struct/Pnr/Retrieve/Reservation.php
index 7f283a1c1..03f0212a6 100644
--- a/src/Amadeus/Client/Struct/Pnr/Retrieve/Reservation.php
+++ b/src/Amadeus/Client/Struct/Pnr/Retrieve/Reservation.php
@@ -42,4 +42,4 @@ public function __construct($recordLocator = null)
     {
         $this->controlNumber = $recordLocator;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Amadeus/Client/Struct/Pnr/Retrieve/ReservationOrProfileIdentifier.php b/src/Amadeus/Client/Struct/Pnr/Retrieve/ReservationOrProfileIdentifier.php
index afd705922..f218ba781 100644
--- a/src/Amadeus/Client/Struct/Pnr/Retrieve/ReservationOrProfileIdentifier.php
+++ b/src/Amadeus/Client/Struct/Pnr/Retrieve/ReservationOrProfileIdentifier.php
@@ -42,4 +42,4 @@ public function __construct($recLoc = null)
     {
         $this->reservation = new Reservation($recLoc);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Amadeus/Client/Struct/Pnr/Retrieve/RetrievalFacts.php b/src/Amadeus/Client/Struct/Pnr/Retrieve/RetrievalFacts.php
index e24d6cf50..9c6f7e0b7 100644
--- a/src/Amadeus/Client/Struct/Pnr/Retrieve/RetrievalFacts.php
+++ b/src/Amadeus/Client/Struct/Pnr/Retrieve/RetrievalFacts.php
@@ -68,4 +68,4 @@ public function __construct($retrievalType, $recordLocator = null)
                 new ReservationOrProfileIdentifier($recordLocator);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Amadeus/Client/Struct/Pnr/Retrieve/Retrieve.php b/src/Amadeus/Client/Struct/Pnr/Retrieve/Retrieve.php
index 6ff3dbc7d..0724f27f6 100644
--- a/src/Amadeus/Client/Struct/Pnr/Retrieve/Retrieve.php
+++ b/src/Amadeus/Client/Struct/Pnr/Retrieve/Retrieve.php
@@ -68,4 +68,4 @@ public function __construct($retrievalType)
     {
         $this->type = $retrievalType;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Amadeus/Client/Struct/Pnr/Retrieve/Settings.php b/src/Amadeus/Client/Struct/Pnr/Retrieve/Settings.php
index c6f5b0c05..a36496ef8 100644
--- a/src/Amadeus/Client/Struct/Pnr/Retrieve/Settings.php
+++ b/src/Amadeus/Client/Struct/Pnr/Retrieve/Settings.php
@@ -40,4 +40,4 @@ class Settings
      * @todo Expand this structure
      */
     public $printer;
-}
\ No newline at end of file
+}
diff --git a/src/Amadeus/Client/Struct/Pnr/RetrieveAndDisplay/DynamicOutputOption.php b/src/Amadeus/Client/Struct/Pnr/RetrieveAndDisplay/DynamicOutputOption.php
index 4629e8efd..4c3320b96 100644
--- a/src/Amadeus/Client/Struct/Pnr/RetrieveAndDisplay/DynamicOutputOption.php
+++ b/src/Amadeus/Client/Struct/Pnr/RetrieveAndDisplay/DynamicOutputOption.php
@@ -42,5 +42,4 @@ public function __construct($action)
     {
         $this->statusDetails = new StatusDetails($action);
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/Amadeus/Client/Struct/PriceXplorer/AirlineInfo.php b/src/Amadeus/Client/Struct/PriceXplorer/AirlineInfo.php
index e70bbf43f..7b1b82dc6 100644
--- a/src/Amadeus/Client/Struct/PriceXplorer/AirlineInfo.php
+++ b/src/Amadeus/Client/Struct/PriceXplorer/AirlineInfo.php
@@ -34,7 +34,7 @@ class AirlineInfo
      * @var mixed
      */
     public $attributeInfo;
-	
+
     /**
      * @var mixed
      */
diff --git a/src/Amadeus/Client/Struct/PriceXplorer/AttributeDetails.php b/src/Amadeus/Client/Struct/PriceXplorer/AttributeDetails.php
index 108114db5..8d751bd9a 100644
--- a/src/Amadeus/Client/Struct/PriceXplorer/AttributeDetails.php
+++ b/src/Amadeus/Client/Struct/PriceXplorer/AttributeDetails.php
@@ -31,26 +31,26 @@
 class AttributeDetails
 {
     const TYPE_DEPARTURE_DAY = "DAY";
-	
+    
     const TYPE_DESTINATION = "DES";
-	
+    
     const TYPE_MONTH = "MTH";
-	
+    
     const TYPE_PASSENGER_TYPE_PROFILE = "PRO";
-	
+    
     const TYPE_STAY_DURATION = "SD";
-	
+    
     const TYPE_WEEK = "WEEK";
-	
+    
     const TYPE_COUNTRY = "CTRY";
-	
+    
     /**
-     * DAY 	Per departure day
-     * DES 	Per destination
-     * MTH 	Per month
-     * PRO 	Passenger type profile
-     * SD 	Per stay duration
-     * WEEK 	Per week
+     * DAY     Per departure day
+     * DES     Per destination
+     * MTH     Per month
+     * PRO     Passenger type profile
+     * SD     Per stay duration
+     * WEEK     Per week
      *
      * @var string self::TYPE_*
      */
@@ -59,7 +59,7 @@ class AttributeDetails
      * @var string
      */
     public $attributeDescription;
-	
+    
     /**
      * @param string $type self::TYPE_*
      */
diff --git a/src/Amadeus/Client/Struct/PriceXplorer/AttributeInfo.php b/src/Amadeus/Client/Struct/PriceXplorer/AttributeInfo.php
index 2586c4dec..5448dc1fa 100644
--- a/src/Amadeus/Client/Struct/PriceXplorer/AttributeInfo.php
+++ b/src/Amadeus/Client/Struct/PriceXplorer/AttributeInfo.php
@@ -31,19 +31,19 @@
 class AttributeInfo
 {
     const FUNC_GROUPING = "GRP";
-	
+    
     const FUNC_PASSENGER = "PSG";
-	
+    
     /**
      * @var string self::FUNC_*
      */
     public $attributeFunction;
-	
+    
     /**
      * @var AttributeDetails[]
      */
     public $attributeDetails = [];
-	
+    
     /**
      * @param string $function self::FUNC_*
      * @param array $groupTypes AttributeDetails::TYPE_* strings
@@ -51,7 +51,7 @@ class AttributeInfo
     public function __construct($function = self::FUNC_GROUPING, $groupTypes = [])
     {
         $this->attributeFunction = $function;
-		
+        
         foreach ($groupTypes as $groupType) {
             $this->attributeDetails[] = new AttributeDetails($groupType);
         }
diff --git a/src/Amadeus/Client/Struct/PriceXplorer/Budget.php b/src/Amadeus/Client/Struct/PriceXplorer/Budget.php
index 8a846aa94..769184ee7 100644
--- a/src/Amadeus/Client/Struct/PriceXplorer/Budget.php
+++ b/src/Amadeus/Client/Struct/PriceXplorer/Budget.php
@@ -34,7 +34,7 @@ class Budget
      * @var MonetaryDetails[]
      */
     public $monetaryDetails = [];
-	
+
     /**
      * When providing MAX or MIN you MUST specify currency
      *
@@ -51,7 +51,7 @@ public function __construct($maxBudget = null, $minBudget = null, $currency = nu
                 $currency
             );
         }
-		
+
         if ($minBudget !== null && $currency !== null) {
             $this->monetaryDetails[] = new MonetaryDetails(
                 $minBudget,
diff --git a/src/Amadeus/Client/Struct/PriceXplorer/DateAndTimeDetails.php b/src/Amadeus/Client/Struct/PriceXplorer/DateAndTimeDetails.php
index 8e813f073..0f219e719 100644
--- a/src/Amadeus/Client/Struct/PriceXplorer/DateAndTimeDetails.php
+++ b/src/Amadeus/Client/Struct/PriceXplorer/DateAndTimeDetails.php
@@ -34,27 +34,27 @@ class DateAndTimeDetails
     const QUAL_ENDDATE = "E";
     const QUAL_RETURNDATE = "R";
     const QUAL_STARTDATE = "S";
-	
+    
     /**
      * @var string self::QUAL_*
      */
     public $qualifier;
-	
+    
     /**
      * @var string Format: ddmmyy
      */
     public $date;
-	
+    
     /**
      * @var string
      */
     public $time;
-	
+    
     /**
      * @var string
      */
     public $otherQualifier;
-	
+    
     /**
      * @var string
      */
diff --git a/src/Amadeus/Client/Struct/PriceXplorer/DaySelection.php b/src/Amadeus/Client/Struct/PriceXplorer/DaySelection.php
index 8abb64ea6..de4115d40 100644
--- a/src/Amadeus/Client/Struct/PriceXplorer/DaySelection.php
+++ b/src/Amadeus/Client/Struct/PriceXplorer/DaySelection.php
@@ -39,7 +39,7 @@ class DaySelection
      * @var string
      */
     public $dayOfWeek;
-	
+
     /**
      * @param array $weekDays Week days in array format: e.g. array(1, 2) for Monday and Tuesday. MUST BE CONSECUTIVE DAYS
      */
diff --git a/src/Amadeus/Client/Struct/PriceXplorer/DepartureDays.php b/src/Amadeus/Client/Struct/PriceXplorer/DepartureDays.php
index 0809d0c16..8c2a8f440 100644
--- a/src/Amadeus/Client/Struct/PriceXplorer/DepartureDays.php
+++ b/src/Amadeus/Client/Struct/PriceXplorer/DepartureDays.php
@@ -42,7 +42,7 @@ class DepartureDays
      * @var SelectionInfo
      */
     public $selectionInfo;
-	
+
     /**
      * @param array $weekDays Week days in array format: e.g. array(1, 2) for Monday and Tuesday. MUST BE CONSECUTIVE DAYS
      * @param string $departureDayOption
@@ -50,7 +50,7 @@ class DepartureDays
     public function __construct($weekDays = [], $departureDayOption = null)
     {
         $this->daySelection = new DaySelection($weekDays);
-		
+
         if ($departureDayOption === null) {
             $this->selectionInfo = new SelectionInfo();
         } else {
diff --git a/src/Amadeus/Client/Struct/PriceXplorer/ExtremeSearch.php b/src/Amadeus/Client/Struct/PriceXplorer/ExtremeSearch.php
index 2e1e112cd..106660007 100644
--- a/src/Amadeus/Client/Struct/PriceXplorer/ExtremeSearch.php
+++ b/src/Amadeus/Client/Struct/PriceXplorer/ExtremeSearch.php
@@ -237,7 +237,7 @@ protected function makeAggregationGroupTypes($groupTypeString)
     {
         $result = [];
 
-        switch($groupTypeString) {
+        switch ($groupTypeString) {
             case PriceXplorerExtremeSearchOptions::AGGR_DEST:
                 $result[] = AttributeDetails::TYPE_DESTINATION;
                 break;
diff --git a/src/Amadeus/Client/Struct/PriceXplorer/FlexibilityInfo.php b/src/Amadeus/Client/Struct/PriceXplorer/FlexibilityInfo.php
index cde7bd495..b767ed9d9 100644
--- a/src/Amadeus/Client/Struct/PriceXplorer/FlexibilityInfo.php
+++ b/src/Amadeus/Client/Struct/PriceXplorer/FlexibilityInfo.php
@@ -34,7 +34,7 @@ class FlexibilityInfo
      * @var QuantityDetailsType[]
      */
     public $quantityDetails = [];
-	
+
     /**
      * @param int $flexibilityDays Number of flexible days
      */
diff --git a/src/Amadeus/Client/Struct/PriceXplorer/ItineraryGrp.php b/src/Amadeus/Client/Struct/PriceXplorer/ItineraryGrp.php
index 753e598f2..6f1b0e4d1 100644
--- a/src/Amadeus/Client/Struct/PriceXplorer/ItineraryGrp.php
+++ b/src/Amadeus/Client/Struct/PriceXplorer/ItineraryGrp.php
@@ -34,12 +34,12 @@ class ItineraryGrp
      * @var ItineraryInfo
      */
     public $itineraryInfo;
-	
+
     /**
      * @var LocationInfo
      */
     public $locationInfo;
-	
+
     /**
      * Construct ItineraryGrp
      *
diff --git a/src/Amadeus/Client/Struct/PriceXplorer/ItineraryInfo.php b/src/Amadeus/Client/Struct/PriceXplorer/ItineraryInfo.php
index f0bcfbdd9..4c9c56935 100644
--- a/src/Amadeus/Client/Struct/PriceXplorer/ItineraryInfo.php
+++ b/src/Amadeus/Client/Struct/PriceXplorer/ItineraryInfo.php
@@ -34,12 +34,12 @@ class ItineraryInfo
      * @var string
      */
     public $origin;
-	
+
     /**
      * @var string
      */
     public $destination;
-	
+
     /**
      * @param string $origin
      * @param string $destination
diff --git a/src/Amadeus/Client/Struct/PriceXplorer/LocationIdentificationType.php b/src/Amadeus/Client/Struct/PriceXplorer/LocationIdentificationType.php
index b2414f955..b3931f6c4 100644
--- a/src/Amadeus/Client/Struct/PriceXplorer/LocationIdentificationType.php
+++ b/src/Amadeus/Client/Struct/PriceXplorer/LocationIdentificationType.php
@@ -31,15 +31,15 @@
 class LocationIdentificationType
 {
     const QUAL_DESTINATION = "D";
-	
+
     const QUAL_ORIGIN = "O";
-	
+
     /**
      * Identification of the name of place/location, other than 3164 City name.
      *
      * IATA Code or:
-     * ARNK 	ARNK (for RTG use only)
-     * ZZZ 	ZZZ (used to designate all cities)
+     * ARNK     ARNK (for RTG use only)
+     * ZZZ     ZZZ (used to designate all cities)
      *
      * @var string
      */
diff --git a/src/Amadeus/Client/Struct/PriceXplorer/LocationInfo.php b/src/Amadeus/Client/Struct/PriceXplorer/LocationInfo.php
index 3f930634f..5e21f552d 100644
--- a/src/Amadeus/Client/Struct/PriceXplorer/LocationInfo.php
+++ b/src/Amadeus/Client/Struct/PriceXplorer/LocationInfo.php
@@ -32,19 +32,19 @@ class LocationInfo
 {
     /**
      * Location Types:
-     * 25 	City
-     * 26 	Country
-     * A 	Airport
-     * R 	Region
+     * 25     City
+     * 26     Country
+     * A     Airport
+     * R     Region
      */
     const LOC_CITY = 25;
-	
+
     const LOC_COUNTRY = 26;
-	
+
     const LOC_AIRPORT = "A";
-	
+
     const LOC_REGION = "R";
-	
+
     /**
      * @var string
      */
@@ -53,7 +53,7 @@ class LocationInfo
      * @var LocationIdentificationType
      */
     public $locationDescription;
-	
+
     /**
      * @param string|int $locationType One of the constants self::LOC_*
      */
diff --git a/src/Amadeus/Client/Struct/PriceXplorer/MonetaryDetails.php b/src/Amadeus/Client/Struct/PriceXplorer/MonetaryDetails.php
index 936d68279..06a17313a 100644
--- a/src/Amadeus/Client/Struct/PriceXplorer/MonetaryDetails.php
+++ b/src/Amadeus/Client/Struct/PriceXplorer/MonetaryDetails.php
@@ -31,9 +31,9 @@
 class MonetaryDetails
 {
     const QUAL_MAX_BUDGET = "MAX";
-	
+
     const QUAL_MIN_BUDGET = "MIN";
-	
+
     /**
      * @var string self::QUAL_*
      */
@@ -46,7 +46,7 @@ class MonetaryDetails
      * @var string
      */
     public $currency;
-	
+
     /**
      * @param double|string $amount
      * @param string $qualifier MonetaryDetails::QUAL_*
diff --git a/src/Amadeus/Client/Struct/PriceXplorer/NbOfUnitsInfo.php b/src/Amadeus/Client/Struct/PriceXplorer/NbOfUnitsInfo.php
index 3c01338ff..b7b75a901 100644
--- a/src/Amadeus/Client/Struct/PriceXplorer/NbOfUnitsInfo.php
+++ b/src/Amadeus/Client/Struct/PriceXplorer/NbOfUnitsInfo.php
@@ -34,7 +34,7 @@ class NbOfUnitsInfo
      * @var NumberOfUnitDetailsType[]
      */
     public $quantityDetails = [];
-	
+
     /**
      * @param int $numberOfDays
      */
diff --git a/src/Amadeus/Client/Struct/PriceXplorer/NumberOfUnitDetailsType.php b/src/Amadeus/Client/Struct/PriceXplorer/NumberOfUnitDetailsType.php
index 6af591d11..61973821f 100644
--- a/src/Amadeus/Client/Struct/PriceXplorer/NumberOfUnitDetailsType.php
+++ b/src/Amadeus/Client/Struct/PriceXplorer/NumberOfUnitDetailsType.php
@@ -30,36 +30,36 @@
  */
 class NumberOfUnitDetailsType
 {
-	
+
     /*
-	 * https://webservices.amadeus.com/extranet/structures/viewMessageStructure.do?id=2338&serviceVersionId=2304&isQuery=true#
-	 * 	CNS 	Cheapest non-stop
-	 * 	COP 	Cheapest over all price
-	 * 	DAY 	Day
-	 * 	MTH 	Month
-	 * 	PR 	Number of price results
-	 */
+     * https://webservices.amadeus.com/extranet/structures/viewMessageStructure.do?id=2338&serviceVersionId=2304&isQuery=true#
+     *     CNS     Cheapest non-stop
+     *     COP     Cheapest over all price
+     *     DAY     Day
+     *     MTH     Month
+     *     PR     Number of price results
+     */
     const QUAL_CHEAPEST_NONSTOP = "CNS";
-	
+
     const QUAL_CHEAPEST_OVERALL = "COP";
-	
+
     const QUAL_DAY = "DAY";
-	
+
     const QUAL_MONTH = "MTH";
-	
+
     const QUAL_NR_OF_PRICE_RESULTS = "PR";
-	
-	
+
+
     /**
      * @var int
      */
     public $numberOfUnit;
-	
+
     /**
      * @var string self::QUAL_*
      */
     public $unitQualifier;
-	
+
     /**
      * Create NumberOfUnitDetailsType
      *
diff --git a/src/Amadeus/Client/Struct/PriceXplorer/OfficeId.php b/src/Amadeus/Client/Struct/PriceXplorer/OfficeId.php
index 73e811907..150fa2b33 100644
--- a/src/Amadeus/Client/Struct/PriceXplorer/OfficeId.php
+++ b/src/Amadeus/Client/Struct/PriceXplorer/OfficeId.php
@@ -43,7 +43,7 @@ class OfficeId
      * @var mixed
      */
     public $originator;
-	
+
     /**
      * @param string $officeId
      */
diff --git a/src/Amadeus/Client/Struct/PriceXplorer/OfficeIdInfo.php b/src/Amadeus/Client/Struct/PriceXplorer/OfficeIdInfo.php
index de2de6591..5ea607a3b 100644
--- a/src/Amadeus/Client/Struct/PriceXplorer/OfficeIdInfo.php
+++ b/src/Amadeus/Client/Struct/PriceXplorer/OfficeIdInfo.php
@@ -36,7 +36,7 @@ class OfficeIdInfo
      * @var OfficeId
      */
     public $officeId;
-	
+
     /**
      *
      * @param string $officeId
diff --git a/src/Amadeus/Client/Struct/PriceXplorer/OriginIdentification.php b/src/Amadeus/Client/Struct/PriceXplorer/OriginIdentification.php
index 596083225..c348e734f 100644
--- a/src/Amadeus/Client/Struct/PriceXplorer/OriginIdentification.php
+++ b/src/Amadeus/Client/Struct/PriceXplorer/OriginIdentification.php
@@ -34,22 +34,22 @@ class OriginIdentification
      * @var string
      */
     public $originatorId;
-	
+
     /**
      * @var string
      */
     public $inHouseIdentification1;
-	
+
     /**
      * @var string
      */
     public $inHouseIdentification2;
-	
+
     /**
      * @var string
      */
     public $inHouseIdentification3;
-	
+
     /**
      * @param string $officeId
      */
diff --git a/src/Amadeus/Client/Struct/PriceXplorer/QuantityDetailsType.php b/src/Amadeus/Client/Struct/PriceXplorer/QuantityDetailsType.php
index f8c2d3df8..9130f9183 100644
--- a/src/Amadeus/Client/Struct/PriceXplorer/QuantityDetailsType.php
+++ b/src/Amadeus/Client/Struct/PriceXplorer/QuantityDetailsType.php
@@ -34,23 +34,23 @@ class QuantityDetailsType
      * https://webservices.amadeus.com/extranet/structures/viewMessageStructure.do?id=2338&serviceVersionId=2304&isQuery=true#
      * PriceXplorer_ExtremeSearch/itineraryGrp/quantityInfo/quantityDetails/unit
      * UNITS:
-     * DAY 	Day
-     * MTH 	Month
-     * WK 	Week
+     * DAY     Day
+     * MTH     Month
+     * WK     Week
      */
     const UNIT_DAY = "DAY";
-	
+
     const UNIT_WEEK = "WK";
-	
+
     const UNIT_MONTH = "MTH";
-	
+
     /**
      * https://webservices.amadeus.com/extranet/structures/viewMessageStructure.do?id=2338&serviceVersionId=2304&isQuery=true#
      * PriceXplorer_ExtremeSearch/itineraryGrp/quantityInfo/quantityDetails/qualifier
      * @var string
      */
     const QUAL_PLUS = "P";
-	
+
     /**
      * @var string
      */
@@ -63,7 +63,7 @@ class QuantityDetailsType
      * @var string
      */
     public $unit;
-	
+
     /**
      * @param int $value
      * @param string $unit
diff --git a/src/Amadeus/Client/Struct/PriceXplorer/SelectionDetails.php b/src/Amadeus/Client/Struct/PriceXplorer/SelectionDetails.php
index ae75ab243..e732e580b 100644
--- a/src/Amadeus/Client/Struct/PriceXplorer/SelectionDetails.php
+++ b/src/Amadeus/Client/Struct/PriceXplorer/SelectionDetails.php
@@ -31,18 +31,18 @@
 class SelectionDetails
 {
     const OPT_INBOUND_DEP_DAYS = "I";
-	
+
     const OPT_OUTBOUND_DEP_DAYS = "O";
-	
+
     /*
-	 * PRD 	Price result distribution
-	 * TWD 	Time window distribution
-	 */
+     * PRD     Price result distribution
+     * TWD     Time window distribution
+     */
     const OPT_PRICE_RESULT_DISTRIBUTION = "PRD";
-	
+
     const OPT_TIME_WINDOW_DISTRIBUTION = "TWD";
-	
-	
+
+
     /**
      * @var string
      */
@@ -51,7 +51,7 @@ class SelectionDetails
      * @var string
      */
     public $optionInformation;
-	
+
     /**
      * @param string $option self::OPT_*
      */
diff --git a/src/Amadeus/Client/Struct/PriceXplorer/SelectionDetailsGroup.php b/src/Amadeus/Client/Struct/PriceXplorer/SelectionDetailsGroup.php
index b21dcb309..4657811a3 100644
--- a/src/Amadeus/Client/Struct/PriceXplorer/SelectionDetailsGroup.php
+++ b/src/Amadeus/Client/Struct/PriceXplorer/SelectionDetailsGroup.php
@@ -30,28 +30,28 @@
  */
 class SelectionDetailsGroup
 {
-	/**
-	 * @var SelectionDetailsInfo
-	 */
-	public $selectionDetailsInfo;
-	
-	/**
-	 * @var NbOfUnitsInfo
-	 */
-	public $nbOfUnitsInfo;
-	
-	/**
-	 * @var DateAndTimeInfo
-	 */
-	public $dateAndTimeInfo;
-	
-	/**
-	 * @var QuantityInfo
-	 */
-	public $quantityInfo;
-	
-	/**
-	 * @var array
-	 */
-	public $attributeInfo = [];
+    /**
+     * @var SelectionDetailsInfo
+     */
+    public $selectionDetailsInfo;
+    
+    /**
+     * @var NbOfUnitsInfo
+     */
+    public $nbOfUnitsInfo;
+    
+    /**
+     * @var DateAndTimeInfo
+     */
+    public $dateAndTimeInfo;
+    
+    /**
+     * @var QuantityInfo
+     */
+    public $quantityInfo;
+    
+    /**
+     * @var array
+     */
+    public $attributeInfo = [];
 }
diff --git a/src/Amadeus/Client/Struct/PriceXplorer/SelectionInfo.php b/src/Amadeus/Client/Struct/PriceXplorer/SelectionInfo.php
index 87bb88224..ea0075a10 100644
--- a/src/Amadeus/Client/Struct/PriceXplorer/SelectionInfo.php
+++ b/src/Amadeus/Client/Struct/PriceXplorer/SelectionInfo.php
@@ -34,7 +34,7 @@ class SelectionInfo
      * @var SelectionDetails[]
      */
     public $selectionDetails = [];
-	
+
     /**
      * @param string $departureDayOption SelectionDetails::OPT_*
      */
diff --git a/src/Amadeus/Client/Struct/PriceXplorer/StayDuration.php b/src/Amadeus/Client/Struct/PriceXplorer/StayDuration.php
index 3b2c2a920..08beb18ed 100644
--- a/src/Amadeus/Client/Struct/PriceXplorer/StayDuration.php
+++ b/src/Amadeus/Client/Struct/PriceXplorer/StayDuration.php
@@ -38,7 +38,7 @@ class StayDuration
      * @var FlexibilityInfo
      */
     public $flexibilityInfo;
-	
+
     /**
      * @param int $numberOfDays
      */
diff --git a/src/Amadeus/Client/Struct/PriceXplorer/TravelDates.php b/src/Amadeus/Client/Struct/PriceXplorer/TravelDates.php
index 84854ef91..cfad73150 100644
--- a/src/Amadeus/Client/Struct/PriceXplorer/TravelDates.php
+++ b/src/Amadeus/Client/Struct/PriceXplorer/TravelDates.php
@@ -34,7 +34,7 @@ class TravelDates
      * @var DateAndTimeDetails[]
      */
     public $dateAndTimeDetails = [];
-	
+
     /**
      * @param \DateTime|null $earliestDepartureDate
      * @param \DateTime|null $latestDepartureDate
@@ -47,7 +47,7 @@ public function __construct($earliestDepartureDate = null, $latestDepartureDate
                 $earliestDepartureDate
             );
         }
-		
+
         if ($latestDepartureDate instanceof \DateTime) {
             $this->dateAndTimeDetails[] = new DateAndTimeDetails(
                 DateAndTimeDetails::QUAL_ENDDATE,
diff --git a/src/Amadeus/Client/Struct/Queue/Dumbo.php b/src/Amadeus/Client/Struct/Queue/Dumbo.php
index 756e60626..899cabcac 100644
--- a/src/Amadeus/Client/Struct/Queue/Dumbo.php
+++ b/src/Amadeus/Client/Struct/Queue/Dumbo.php
@@ -30,5 +30,4 @@
  */
 class Dumbo
 {
-
 }
diff --git a/src/Amadeus/Client/Struct/Queue/MoveItem.php b/src/Amadeus/Client/Struct/Queue/MoveItem.php
index 86af74493..0a3e83ead 100644
--- a/src/Amadeus/Client/Struct/Queue/MoveItem.php
+++ b/src/Amadeus/Client/Struct/Queue/MoveItem.php
@@ -54,7 +54,6 @@ class MoveItem extends BaseWsMessage
      */
     public $numberOfPNRs;
 
-
     /**
      * @param string $recordLocator
      * @param string $sourceOffice
@@ -70,4 +69,4 @@ public function __construct($recordLocator, $sourceOffice, $sourceQueue, $destin
 
         $this->recordLocator = new RecordLocator($recordLocator);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Amadeus/Client/Struct/Queue/PlacePnr.php b/src/Amadeus/Client/Struct/Queue/PlacePnr.php
index 24488b268..d1b7dc4e6 100644
--- a/src/Amadeus/Client/Struct/Queue/PlacePnr.php
+++ b/src/Amadeus/Client/Struct/Queue/PlacePnr.php
@@ -59,4 +59,4 @@ public function __construct($recordLocator, $sourceOfficeId, $targetQueue)
 
         $this->recordLocator = new RecordLocator($recordLocator);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Amadeus/Client/Struct/Queue/PlacementOption.php b/src/Amadeus/Client/Struct/Queue/PlacementOption.php
index e3c4da13c..32450435b 100644
--- a/src/Amadeus/Client/Struct/Queue/PlacementOption.php
+++ b/src/Amadeus/Client/Struct/Queue/PlacementOption.php
@@ -41,4 +41,4 @@ public function __construct($optionCode)
     {
         $this->selectionDetails = new SelectionDetails($optionCode);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Amadeus/Client/Struct/Queue/QuantityDetails.php b/src/Amadeus/Client/Struct/Queue/QuantityDetails.php
index d43809b32..81b2beef1 100644
--- a/src/Amadeus/Client/Struct/Queue/QuantityDetails.php
+++ b/src/Amadeus/Client/Struct/Queue/QuantityDetails.php
@@ -42,4 +42,4 @@ public function __construct($amount)
     {
         $this->numberOfUnit = $amount;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Amadeus/Client/Struct/Queue/RemovalOption.php b/src/Amadeus/Client/Struct/Queue/RemovalOption.php
index f4670cbbb..c04f9e0c8 100644
--- a/src/Amadeus/Client/Struct/Queue/RemovalOption.php
+++ b/src/Amadeus/Client/Struct/Queue/RemovalOption.php
@@ -42,4 +42,4 @@ public function __construct($optionCode)
     {
         $this->selectionDetails = new SelectionDetails($optionCode);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Amadeus/Client/Struct/Queue/RemoveItem.php b/src/Amadeus/Client/Struct/Queue/RemoveItem.php
index a1cfa5f52..58c433ec3 100644
--- a/src/Amadeus/Client/Struct/Queue/RemoveItem.php
+++ b/src/Amadeus/Client/Struct/Queue/RemoveItem.php
@@ -57,4 +57,4 @@ public function __construct($targetQueue, $recordLocator, $originatorOffice)
 
         $this->targetDetails[] = new TargetDetails($targetQueue, $recordLocator, $originatorOffice);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Amadeus/Client/Struct/Queue/Reservation.php b/src/Amadeus/Client/Struct/Queue/Reservation.php
index 11baefc0d..73282ea52 100644
--- a/src/Amadeus/Client/Struct/Queue/Reservation.php
+++ b/src/Amadeus/Client/Struct/Queue/Reservation.php
@@ -31,5 +31,4 @@
  */
 class Reservation extends Pnr\Reservation
 {
-
-}
\ No newline at end of file
+}
diff --git a/src/Amadeus/Client/Struct/Queue/Scroll.php b/src/Amadeus/Client/Struct/Queue/Scroll.php
index cf0d4d4cf..b236ad3b8 100644
--- a/src/Amadeus/Client/Struct/Queue/Scroll.php
+++ b/src/Amadeus/Client/Struct/Queue/Scroll.php
@@ -34,4 +34,4 @@ class Scroll
     * @var NumberOfItemsDetails
     */
     public $numberOfItemsDetails;
-}
\ No newline at end of file
+}
diff --git a/src/Amadeus/Client/Struct/Queue/SearchCriteria.php b/src/Amadeus/Client/Struct/Queue/SearchCriteria.php
index b21a9e68d..395440014 100644
--- a/src/Amadeus/Client/Struct/Queue/SearchCriteria.php
+++ b/src/Amadeus/Client/Struct/Queue/SearchCriteria.php
@@ -30,5 +30,4 @@
  */
 class SearchCriteria
 {
-
 }
diff --git a/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport.php b/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport.php
index 47d302ff6..d0d0d0518 100644
--- a/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport.php
+++ b/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport.php
@@ -150,7 +150,6 @@ protected function loadRequestOptions($requestOptions)
      */
     protected function loadAgencySource($agencySourceType, $iataNumber, $officeId)
     {
-
     }
 
     /**
@@ -158,7 +157,6 @@ protected function loadAgencySource($agencySourceType, $iataNumber, $officeId)
      */
     protected function loadAgent($agentCode)
     {
-
     }
 
     /**
@@ -168,7 +166,6 @@ protected function loadAgent($agentCode)
      */
     protected function loadTransaction($type, $code, $issueIndicator)
     {
-
     }
 
     /**
@@ -176,7 +173,6 @@ protected function loadTransaction($type, $code, $issueIndicator)
      */
     protected function loadValidatingCarrier($validatingCarrier)
     {
-
     }
 
     /**
@@ -185,7 +181,6 @@ protected function loadValidatingCarrier($validatingCarrier)
      */
     protected function loadDateRange($startDate, $endDate)
     {
-
     }
 
     /**
@@ -194,7 +189,6 @@ protected function loadDateRange($startDate, $endDate)
      */
     protected function loadDate($type, $date)
     {
-
     }
 
     /**
@@ -203,7 +197,6 @@ protected function loadDate($type, $date)
      */
     protected function loadCurrency($type, $currency)
     {
-
     }
 
     /**
@@ -212,7 +205,6 @@ protected function loadCurrency($type, $currency)
      */
     protected function loadFormOfPayment($type, $vendor)
     {
-
     }
 
     /**
@@ -220,7 +212,6 @@ protected function loadFormOfPayment($type, $vendor)
      */
     protected function loadSalesIndicator($indicator)
     {
-
     }
 
     /**
@@ -229,6 +220,5 @@ protected function loadSalesIndicator($indicator)
      */
     protected function loadScrolling($count, $fromItem)
     {
-
     }
 }
diff --git a/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/ActionDetails.php b/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/ActionDetails.php
index b438b1024..368a6c403 100644
--- a/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/ActionDetails.php
+++ b/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/ActionDetails.php
@@ -30,5 +30,4 @@
  */
 class ActionDetails
 {
-
 }
diff --git a/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/AgentUserDetails.php b/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/AgentUserDetails.php
index 38aff7ff4..0085bf137 100644
--- a/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/AgentUserDetails.php
+++ b/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/AgentUserDetails.php
@@ -30,5 +30,4 @@
  */
 class AgentUserDetails
 {
-
 }
diff --git a/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/AttributeInfo.php b/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/AttributeInfo.php
index e77a52686..af9a76412 100644
--- a/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/AttributeInfo.php
+++ b/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/AttributeInfo.php
@@ -30,5 +30,4 @@
  */
 class AttributeInfo
 {
-
 }
diff --git a/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/CurrencyInfo.php b/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/CurrencyInfo.php
index 222a9a04d..c31c36e95 100644
--- a/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/CurrencyInfo.php
+++ b/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/CurrencyInfo.php
@@ -30,5 +30,4 @@
  */
 class CurrencyInfo
 {
-
 }
diff --git a/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/DateDetails.php b/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/DateDetails.php
index ea84c13e0..fe67db943 100644
--- a/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/DateDetails.php
+++ b/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/DateDetails.php
@@ -30,5 +30,4 @@
  */
 class DateDetails
 {
-
 }
diff --git a/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/FormOfPaymentDetails.php b/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/FormOfPaymentDetails.php
index 308253012..858af202e 100644
--- a/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/FormOfPaymentDetails.php
+++ b/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/FormOfPaymentDetails.php
@@ -30,5 +30,4 @@
  */
 class FormOfPaymentDetails
 {
-
 }
diff --git a/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/FromSequenceDocumentNumber.php b/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/FromSequenceDocumentNumber.php
index d26abebee..be3b12e79 100644
--- a/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/FromSequenceDocumentNumber.php
+++ b/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/FromSequenceDocumentNumber.php
@@ -30,5 +30,4 @@
  */
 class FromSequenceDocumentNumber
 {
-
 }
diff --git a/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/SalesIndicator.php b/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/SalesIndicator.php
index 2b68fecf2..8c9df1240 100644
--- a/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/SalesIndicator.php
+++ b/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/SalesIndicator.php
@@ -30,5 +30,4 @@
  */
 class SalesIndicator
 {
-
 }
diff --git a/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/SalesPeriodDetails.php b/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/SalesPeriodDetails.php
index 31bf4d074..6a5dc72f1 100644
--- a/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/SalesPeriodDetails.php
+++ b/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/SalesPeriodDetails.php
@@ -30,5 +30,4 @@
  */
 class SalesPeriodDetails
 {
-
 }
diff --git a/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/TransactionData.php b/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/TransactionData.php
index 7fa0c5fb8..96b50a930 100644
--- a/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/TransactionData.php
+++ b/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/TransactionData.php
@@ -30,5 +30,4 @@
  */
 class TransactionData
 {
-
 }
diff --git a/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/ValidatingCarrierDetails.php b/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/ValidatingCarrierDetails.php
index b429915be..44098b343 100644
--- a/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/ValidatingCarrierDetails.php
+++ b/src/Amadeus/Client/Struct/SalesReports/DisplayQueryReport/ValidatingCarrierDetails.php
@@ -30,5 +30,4 @@
  */
 class ValidatingCarrierDetails
 {
-
 }
diff --git a/src/Amadeus/Client/Struct/Security/SignOut.php b/src/Amadeus/Client/Struct/Security/SignOut.php
index 9fb5b3cba..5d289a77d 100644
--- a/src/Amadeus/Client/Struct/Security/SignOut.php
+++ b/src/Amadeus/Client/Struct/Security/SignOut.php
@@ -32,5 +32,4 @@
  */
 class SignOut extends BaseWsMessage
 {
-
 }