diff --git a/src/BlockStorage/v2/Api.php b/src/BlockStorage/v2/Api.php
index 6272b954..440aec1e 100644
--- a/src/BlockStorage/v2/Api.php
+++ b/src/BlockStorage/v2/Api.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\BlockStorage\v2;
 
diff --git a/src/BlockStorage/v2/Models/Snapshot.php b/src/BlockStorage/v2/Models/Snapshot.php
index e86fdcdf..e85d44ea 100644
--- a/src/BlockStorage/v2/Models/Snapshot.php
+++ b/src/BlockStorage/v2/Models/Snapshot.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\BlockStorage\v2\Models;
 
diff --git a/src/BlockStorage/v2/Models/Volume.php b/src/BlockStorage/v2/Models/Volume.php
index 2b7aaeb6..f1a472e1 100644
--- a/src/BlockStorage/v2/Models/Volume.php
+++ b/src/BlockStorage/v2/Models/Volume.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 namespace OpenStack\BlockStorage\v2\Models;
 
 use OpenStack\Common\Resource\OperatorResource;
diff --git a/src/BlockStorage/v2/Models/VolumeAttachment.php b/src/BlockStorage/v2/Models/VolumeAttachment.php
index 136c9033..6d85b7b4 100644
--- a/src/BlockStorage/v2/Models/VolumeAttachment.php
+++ b/src/BlockStorage/v2/Models/VolumeAttachment.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 namespace OpenStack\BlockStorage\v2\Models;
 
 use OpenStack\Common\Resource\Listable;
diff --git a/src/BlockStorage/v2/Models/VolumeType.php b/src/BlockStorage/v2/Models/VolumeType.php
index 3fe2996a..63d14701 100644
--- a/src/BlockStorage/v2/Models/VolumeType.php
+++ b/src/BlockStorage/v2/Models/VolumeType.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\BlockStorage\v2\Models;
 
diff --git a/src/BlockStorage/v2/Params.php b/src/BlockStorage/v2/Params.php
index db5e6a07..5b5e5cc0 100644
--- a/src/BlockStorage/v2/Params.php
+++ b/src/BlockStorage/v2/Params.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\BlockStorage\v2;
 
diff --git a/src/BlockStorage/v2/Service.php b/src/BlockStorage/v2/Service.php
index a549c1e9..e22c29d4 100644
--- a/src/BlockStorage/v2/Service.php
+++ b/src/BlockStorage/v2/Service.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\BlockStorage\v2;
 
@@ -15,7 +15,7 @@ class Service extends AbstractService
     /**
      * Provisions a new bootable volume, based either on an existing volume, image or snapshot.
      * You must have enough volume storage quota remaining to create a volume of size requested.
-     * 
+     *
      * @param array $userOptions {@see Api::postVolumes}
      *
      * @return Volume
@@ -27,7 +27,7 @@ public function createVolume(array $userOptions): Volume
 
     /**
      * Lists all available volumes.
-     * 
+     *
      * @param bool  $detail      If set to TRUE, more information will be returned.
      * @param array $userOptions {@see Api::getVolumes}
      *
diff --git a/src/Common/Api/AbstractApi.php b/src/Common/Api/AbstractApi.php
index e835729e..49d4d456 100644
--- a/src/Common/Api/AbstractApi.php
+++ b/src/Common/Api/AbstractApi.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types = 1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Api;
 
diff --git a/src/Common/Api/AbstractParams.php b/src/Common/Api/AbstractParams.php
index b10461a0..527ee846 100644
--- a/src/Common/Api/AbstractParams.php
+++ b/src/Common/Api/AbstractParams.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Api;
 
diff --git a/src/Common/Api/ApiInterface.php b/src/Common/Api/ApiInterface.php
index f3babdde..dfa1dc30 100644
--- a/src/Common/Api/ApiInterface.php
+++ b/src/Common/Api/ApiInterface.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Api;
 
diff --git a/src/Common/Api/Operation.php b/src/Common/Api/Operation.php
index 37368efd..3483e092 100644
--- a/src/Common/Api/Operation.php
+++ b/src/Common/Api/Operation.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Api;
 
diff --git a/src/Common/Api/OperatorInterface.php b/src/Common/Api/OperatorInterface.php
index ec9e10db..0337872e 100644
--- a/src/Common/Api/OperatorInterface.php
+++ b/src/Common/Api/OperatorInterface.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Api;
 
diff --git a/src/Common/Api/OperatorTrait.php b/src/Common/Api/OperatorTrait.php
index 45c52c76..f67228da 100644
--- a/src/Common/Api/OperatorTrait.php
+++ b/src/Common/Api/OperatorTrait.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Api;
 
diff --git a/src/Common/Api/Parameter.php b/src/Common/Api/Parameter.php
index 5ef27955..7b7dc938 100644
--- a/src/Common/Api/Parameter.php
+++ b/src/Common/Api/Parameter.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Api;
 
diff --git a/src/Common/ArrayAccessTrait.php b/src/Common/ArrayAccessTrait.php
index 27a8df3d..f0319f88 100644
--- a/src/Common/ArrayAccessTrait.php
+++ b/src/Common/ArrayAccessTrait.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common;
 
diff --git a/src/Common/Auth/AuthHandler.php b/src/Common/Auth/AuthHandler.php
index 9ea7829e..cc17c9ce 100644
--- a/src/Common/Auth/AuthHandler.php
+++ b/src/Common/Auth/AuthHandler.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Auth;
 
diff --git a/src/Common/Auth/Catalog.php b/src/Common/Auth/Catalog.php
index cde29b6a..dca0bfc7 100644
--- a/src/Common/Auth/Catalog.php
+++ b/src/Common/Auth/Catalog.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Auth;
 
diff --git a/src/Common/Auth/IdentityService.php b/src/Common/Auth/IdentityService.php
index c88c02ff..9a7ab94e 100644
--- a/src/Common/Auth/IdentityService.php
+++ b/src/Common/Auth/IdentityService.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Auth;
 
diff --git a/src/Common/Auth/Token.php b/src/Common/Auth/Token.php
index 370a4c16..847363a3 100644
--- a/src/Common/Auth/Token.php
+++ b/src/Common/Auth/Token.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Auth;
 
diff --git a/src/Common/Error/BadResponseError.php b/src/Common/Error/BadResponseError.php
index f1266ac2..e9e796e3 100644
--- a/src/Common/Error/BadResponseError.php
+++ b/src/Common/Error/BadResponseError.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Error;
 
diff --git a/src/Common/Error/BaseError.php b/src/Common/Error/BaseError.php
index 11df13bc..07f0e8b2 100644
--- a/src/Common/Error/BaseError.php
+++ b/src/Common/Error/BaseError.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Error;
 
diff --git a/src/Common/Error/Builder.php b/src/Common/Error/Builder.php
index 347a0e88..304e54eb 100644
--- a/src/Common/Error/Builder.php
+++ b/src/Common/Error/Builder.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Error;
 
diff --git a/src/Common/Error/NotImplementedError.php b/src/Common/Error/NotImplementedError.php
index 3117ba78..c97a4309 100644
--- a/src/Common/Error/NotImplementedError.php
+++ b/src/Common/Error/NotImplementedError.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Error;
 
diff --git a/src/Common/Error/UserInputError.php b/src/Common/Error/UserInputError.php
index 8a4546ed..e8d3c58c 100644
--- a/src/Common/Error/UserInputError.php
+++ b/src/Common/Error/UserInputError.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Error;
 
diff --git a/src/Common/HydratorStrategyTrait.php b/src/Common/HydratorStrategyTrait.php
index d2bb982b..efd03cac 100644
--- a/src/Common/HydratorStrategyTrait.php
+++ b/src/Common/HydratorStrategyTrait.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common;
 
diff --git a/src/Common/JsonPath.php b/src/Common/JsonPath.php
index 6d30eb66..4444dbbc 100644
--- a/src/Common/JsonPath.php
+++ b/src/Common/JsonPath.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types = 1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common;
 
diff --git a/src/Common/JsonSchema/JsonPatch.php b/src/Common/JsonSchema/JsonPatch.php
index f10ad2ba..eb6c6e0a 100644
--- a/src/Common/JsonSchema/JsonPatch.php
+++ b/src/Common/JsonSchema/JsonPatch.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\JsonSchema;
 
diff --git a/src/Common/JsonSchema/Schema.php b/src/Common/JsonSchema/Schema.php
index 773e9b00..40c32b74 100644
--- a/src/Common/JsonSchema/Schema.php
+++ b/src/Common/JsonSchema/Schema.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\JsonSchema;
 
diff --git a/src/Common/Resource/AbstractResource.php b/src/Common/Resource/AbstractResource.php
index e235cd93..a489f6bd 100644
--- a/src/Common/Resource/AbstractResource.php
+++ b/src/Common/Resource/AbstractResource.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Resource;
 
diff --git a/src/Common/Resource/Creatable.php b/src/Common/Resource/Creatable.php
index ba036c2f..92346eb2 100644
--- a/src/Common/Resource/Creatable.php
+++ b/src/Common/Resource/Creatable.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Resource;
 
diff --git a/src/Common/Resource/Deletable.php b/src/Common/Resource/Deletable.php
index d06fdc65..700513e0 100644
--- a/src/Common/Resource/Deletable.php
+++ b/src/Common/Resource/Deletable.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Resource;
 
diff --git a/src/Common/Resource/HasMetadata.php b/src/Common/Resource/HasMetadata.php
index 3fbb3776..042e8cae 100644
--- a/src/Common/Resource/HasMetadata.php
+++ b/src/Common/Resource/HasMetadata.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Resource;
 
diff --git a/src/Common/Resource/HasWaiterTrait.php b/src/Common/Resource/HasWaiterTrait.php
index b1174106..2f6e85e1 100644
--- a/src/Common/Resource/HasWaiterTrait.php
+++ b/src/Common/Resource/HasWaiterTrait.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Resource;
 
diff --git a/src/Common/Resource/Iterator.php b/src/Common/Resource/Iterator.php
index 5f8bcb92..a9cf0704 100644
--- a/src/Common/Resource/Iterator.php
+++ b/src/Common/Resource/Iterator.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Resource;
 
diff --git a/src/Common/Resource/Listable.php b/src/Common/Resource/Listable.php
index 016d4b93..d6c8caf0 100644
--- a/src/Common/Resource/Listable.php
+++ b/src/Common/Resource/Listable.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Resource;
 
diff --git a/src/Common/Resource/ResourceInterface.php b/src/Common/Resource/ResourceInterface.php
index d450232b..7c5ea40b 100644
--- a/src/Common/Resource/ResourceInterface.php
+++ b/src/Common/Resource/ResourceInterface.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Resource;
 
diff --git a/src/Common/Resource/Retrievable.php b/src/Common/Resource/Retrievable.php
index 25dd9a1f..20d7016f 100644
--- a/src/Common/Resource/Retrievable.php
+++ b/src/Common/Resource/Retrievable.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Resource;
 
diff --git a/src/Common/Resource/Updateable.php b/src/Common/Resource/Updateable.php
index 6a62d7a9..82bb5481 100644
--- a/src/Common/Resource/Updateable.php
+++ b/src/Common/Resource/Updateable.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Resource;
 
diff --git a/src/Common/Service/AbstractService.php b/src/Common/Service/AbstractService.php
index 5ba557b7..bf5656b1 100644
--- a/src/Common/Service/AbstractService.php
+++ b/src/Common/Service/AbstractService.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Service;
 
diff --git a/src/Common/Service/Builder.php b/src/Common/Service/Builder.php
index 8c86c87b..2dea14eb 100644
--- a/src/Common/Service/Builder.php
+++ b/src/Common/Service/Builder.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types = 1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Service;
 
diff --git a/src/Common/Service/ServiceInterface.php b/src/Common/Service/ServiceInterface.php
index 897d918a..d7408883 100644
--- a/src/Common/Service/ServiceInterface.php
+++ b/src/Common/Service/ServiceInterface.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Service;
 
diff --git a/src/Common/Transport/HandlerStack.php b/src/Common/Transport/HandlerStack.php
index 222a1d65..9d17c5fe 100644
--- a/src/Common/Transport/HandlerStack.php
+++ b/src/Common/Transport/HandlerStack.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Transport;
 
diff --git a/src/Common/Transport/JsonSerializer.php b/src/Common/Transport/JsonSerializer.php
index 9660bf20..24a62a31 100644
--- a/src/Common/Transport/JsonSerializer.php
+++ b/src/Common/Transport/JsonSerializer.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Transport;
 
diff --git a/src/Common/Transport/Middleware.php b/src/Common/Transport/Middleware.php
index 9829675e..d79828d7 100644
--- a/src/Common/Transport/Middleware.php
+++ b/src/Common/Transport/Middleware.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Transport;
 
diff --git a/src/Common/Transport/RequestSerializer.php b/src/Common/Transport/RequestSerializer.php
index 2448e19f..8fb6481d 100644
--- a/src/Common/Transport/RequestSerializer.php
+++ b/src/Common/Transport/RequestSerializer.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Transport;
 
diff --git a/src/Common/Transport/Utils.php b/src/Common/Transport/Utils.php
index 548ed6d7..7217d446 100644
--- a/src/Common/Transport/Utils.php
+++ b/src/Common/Transport/Utils.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Common\Transport;
 
diff --git a/src/Compute/v2/Api.php b/src/Compute/v2/Api.php
index c0d8b2fe..4ba7acfd 100644
--- a/src/Compute/v2/Api.php
+++ b/src/Compute/v2/Api.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Compute\v2;
 
diff --git a/src/Compute/v2/Enum.php b/src/Compute/v2/Enum.php
index a7f05a66..23d3bf48 100644
--- a/src/Compute/v2/Enum.php
+++ b/src/Compute/v2/Enum.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Compute\v2;
 
diff --git a/src/Compute/v2/Models/Flavor.php b/src/Compute/v2/Models/Flavor.php
index 7582ad86..0455492c 100644
--- a/src/Compute/v2/Models/Flavor.php
+++ b/src/Compute/v2/Models/Flavor.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Compute\v2\Models;
 
diff --git a/src/Compute/v2/Models/HypervisorStatistic.php b/src/Compute/v2/Models/HypervisorStatistic.php
index b594c223..e73501b0 100644
--- a/src/Compute/v2/Models/HypervisorStatistic.php
+++ b/src/Compute/v2/Models/HypervisorStatistic.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types = 1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Compute\v2\Models;
 
diff --git a/src/Compute/v2/Models/Image.php b/src/Compute/v2/Models/Image.php
index 462bdf48..2621a2e6 100644
--- a/src/Compute/v2/Models/Image.php
+++ b/src/Compute/v2/Models/Image.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types = 1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Compute\v2\Models;
 
diff --git a/src/Compute/v2/Models/Keypair.php b/src/Compute/v2/Models/Keypair.php
index dc04aef2..4bd5294a 100644
--- a/src/Compute/v2/Models/Keypair.php
+++ b/src/Compute/v2/Models/Keypair.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types = 1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Compute\v2\Models;
 
diff --git a/src/Compute/v2/Models/Limit.php b/src/Compute/v2/Models/Limit.php
index e360430b..f13871c4 100644
--- a/src/Compute/v2/Models/Limit.php
+++ b/src/Compute/v2/Models/Limit.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types = 1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Compute\v2\Models;
 
diff --git a/src/Compute/v2/Models/Server.php b/src/Compute/v2/Models/Server.php
index 6d2b8cbd..7ed02d8e 100644
--- a/src/Compute/v2/Models/Server.php
+++ b/src/Compute/v2/Models/Server.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Compute\v2\Models;
 
diff --git a/src/Compute/v2/Params.php b/src/Compute/v2/Params.php
index 4d013f58..694e5d9e 100644
--- a/src/Compute/v2/Params.php
+++ b/src/Compute/v2/Params.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Compute\v2;
 
diff --git a/src/Compute/v2/Service.php b/src/Compute/v2/Service.php
index a4639277..33d668b5 100644
--- a/src/Compute/v2/Service.php
+++ b/src/Compute/v2/Service.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Compute\v2;
 
diff --git a/src/Identity/v2/Api.php b/src/Identity/v2/Api.php
index 91daca3d..38623d80 100644
--- a/src/Identity/v2/Api.php
+++ b/src/Identity/v2/Api.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Identity\v2;
 
diff --git a/src/Identity/v2/Models/Catalog.php b/src/Identity/v2/Models/Catalog.php
index 3f08beb0..81abdd10 100644
--- a/src/Identity/v2/Models/Catalog.php
+++ b/src/Identity/v2/Models/Catalog.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Identity\v2\Models;
 
diff --git a/src/Identity/v2/Models/Endpoint.php b/src/Identity/v2/Models/Endpoint.php
index 5133ae4f..b0c215e9 100644
--- a/src/Identity/v2/Models/Endpoint.php
+++ b/src/Identity/v2/Models/Endpoint.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Identity\v2\Models;
 
diff --git a/src/Identity/v2/Models/Entry.php b/src/Identity/v2/Models/Entry.php
index dbac6e7d..02486a4a 100644
--- a/src/Identity/v2/Models/Entry.php
+++ b/src/Identity/v2/Models/Entry.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Identity\v2\Models;
 
diff --git a/src/Identity/v2/Models/Tenant.php b/src/Identity/v2/Models/Tenant.php
index beaec687..9f85a839 100644
--- a/src/Identity/v2/Models/Tenant.php
+++ b/src/Identity/v2/Models/Tenant.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Identity\v2\Models;
 
diff --git a/src/Identity/v2/Models/Token.php b/src/Identity/v2/Models/Token.php
index fe45c048..706971f4 100644
--- a/src/Identity/v2/Models/Token.php
+++ b/src/Identity/v2/Models/Token.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Identity\v2\Models;
 
diff --git a/src/Identity/v2/Service.php b/src/Identity/v2/Service.php
index 0e7f06b1..ebc246ac 100644
--- a/src/Identity/v2/Service.php
+++ b/src/Identity/v2/Service.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Identity\v2;
 
diff --git a/src/Identity/v3/Api.php b/src/Identity/v3/Api.php
index 253ed490..7530e973 100644
--- a/src/Identity/v3/Api.php
+++ b/src/Identity/v3/Api.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Identity\v3;
 
diff --git a/src/Identity/v3/Enum.php b/src/Identity/v3/Enum.php
index 6937b7f8..10c6167d 100644
--- a/src/Identity/v3/Enum.php
+++ b/src/Identity/v3/Enum.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Identity\v3;
 
diff --git a/src/Identity/v3/Models/Assignment.php b/src/Identity/v3/Models/Assignment.php
index 8d595428..7ac5a727 100644
--- a/src/Identity/v3/Models/Assignment.php
+++ b/src/Identity/v3/Models/Assignment.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Identity\v3\Models;
 
diff --git a/src/Identity/v3/Models/Catalog.php b/src/Identity/v3/Models/Catalog.php
index 6db46550..e940f1b0 100644
--- a/src/Identity/v3/Models/Catalog.php
+++ b/src/Identity/v3/Models/Catalog.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Identity\v3\Models;
 
diff --git a/src/Identity/v3/Models/Credential.php b/src/Identity/v3/Models/Credential.php
index e13e83c3..b81a0ff1 100644
--- a/src/Identity/v3/Models/Credential.php
+++ b/src/Identity/v3/Models/Credential.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types = 1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Identity\v3\Models;
 
diff --git a/src/Identity/v3/Models/Domain.php b/src/Identity/v3/Models/Domain.php
index 660cc375..02b1530b 100644
--- a/src/Identity/v3/Models/Domain.php
+++ b/src/Identity/v3/Models/Domain.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Identity\v3\Models;
 
diff --git a/src/Identity/v3/Models/Endpoint.php b/src/Identity/v3/Models/Endpoint.php
index 47a90006..7633ff0d 100644
--- a/src/Identity/v3/Models/Endpoint.php
+++ b/src/Identity/v3/Models/Endpoint.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Identity\v3\Models;
 
diff --git a/src/Identity/v3/Models/Group.php b/src/Identity/v3/Models/Group.php
index 64181380..b16d7db2 100644
--- a/src/Identity/v3/Models/Group.php
+++ b/src/Identity/v3/Models/Group.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Identity\v3\Models;
 
diff --git a/src/Identity/v3/Models/Policy.php b/src/Identity/v3/Models/Policy.php
index b3368fb3..700685b5 100644
--- a/src/Identity/v3/Models/Policy.php
+++ b/src/Identity/v3/Models/Policy.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Identity\v3\Models;
 
diff --git a/src/Identity/v3/Models/Project.php b/src/Identity/v3/Models/Project.php
index 813d6bb8..01f92fb0 100644
--- a/src/Identity/v3/Models/Project.php
+++ b/src/Identity/v3/Models/Project.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Identity\v3\Models;
 
diff --git a/src/Identity/v3/Models/Role.php b/src/Identity/v3/Models/Role.php
index d63a2eda..5dbc1719 100644
--- a/src/Identity/v3/Models/Role.php
+++ b/src/Identity/v3/Models/Role.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Identity\v3\Models;
 
diff --git a/src/Identity/v3/Models/Service.php b/src/Identity/v3/Models/Service.php
index f810cde0..c8f95794 100644
--- a/src/Identity/v3/Models/Service.php
+++ b/src/Identity/v3/Models/Service.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Identity\v3\Models;
 
diff --git a/src/Identity/v3/Models/Token.php b/src/Identity/v3/Models/Token.php
index cdcf4044..28512909 100644
--- a/src/Identity/v3/Models/Token.php
+++ b/src/Identity/v3/Models/Token.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types = 1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Identity\v3\Models;
 
diff --git a/src/Identity/v3/Models/User.php b/src/Identity/v3/Models/User.php
index d1f76517..84200420 100644
--- a/src/Identity/v3/Models/User.php
+++ b/src/Identity/v3/Models/User.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Identity\v3\Models;
 
diff --git a/src/Identity/v3/Params.php b/src/Identity/v3/Params.php
index ea077300..9a160c70 100644
--- a/src/Identity/v3/Params.php
+++ b/src/Identity/v3/Params.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Identity\v3;
 
diff --git a/src/Identity/v3/Service.php b/src/Identity/v3/Service.php
index d4d10ceb..b2dd150b 100644
--- a/src/Identity/v3/Service.php
+++ b/src/Identity/v3/Service.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Identity\v3;
 
diff --git a/src/Images/v2/Api.php b/src/Images/v2/Api.php
index d571593c..6a28ffea 100644
--- a/src/Images/v2/Api.php
+++ b/src/Images/v2/Api.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Images\v2;
 
diff --git a/src/Images/v2/JsonPatch.php b/src/Images/v2/JsonPatch.php
index ed1c6246..860950fd 100644
--- a/src/Images/v2/JsonPatch.php
+++ b/src/Images/v2/JsonPatch.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Images\v2;
 
diff --git a/src/Images/v2/Models/Image.php b/src/Images/v2/Models/Image.php
index b1ebd744..864c85f8 100644
--- a/src/Images/v2/Models/Image.php
+++ b/src/Images/v2/Models/Image.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Images\v2\Models;
 
diff --git a/src/Images/v2/Models/Member.php b/src/Images/v2/Models/Member.php
index a6a9a899..69ec6878 100644
--- a/src/Images/v2/Models/Member.php
+++ b/src/Images/v2/Models/Member.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Images\v2\Models;
 
diff --git a/src/Images/v2/Models/Schema.php b/src/Images/v2/Models/Schema.php
index c275f8c2..d15f743d 100644
--- a/src/Images/v2/Models/Schema.php
+++ b/src/Images/v2/Models/Schema.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Images\v2\Models;
 
diff --git a/src/Images/v2/Params.php b/src/Images/v2/Params.php
index a2a32db7..d2e0b299 100644
--- a/src/Images/v2/Params.php
+++ b/src/Images/v2/Params.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Images\v2;
 
diff --git a/src/Images/v2/Service.php b/src/Images/v2/Service.php
index af73c3e8..0ef13367 100644
--- a/src/Images/v2/Service.php
+++ b/src/Images/v2/Service.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Images\v2;
 
diff --git a/src/Networking/v2/Api.php b/src/Networking/v2/Api.php
index d2f1f794..22bed33b 100644
--- a/src/Networking/v2/Api.php
+++ b/src/Networking/v2/Api.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types = 1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Networking\v2;
 
diff --git a/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroup.php b/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroup.php
index e940d82c..111005a4 100644
--- a/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroup.php
+++ b/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroup.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Networking\v2\Extensions\SecurityGroups\Models;
 
diff --git a/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRule.php b/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRule.php
index e8c9d2b4..de50807b 100644
--- a/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRule.php
+++ b/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRule.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Networking\v2\Extensions\SecurityGroups\Models;
 
diff --git a/src/Networking/v2/Models/Network.php b/src/Networking/v2/Models/Network.php
index e2a67259..a96ec795 100644
--- a/src/Networking/v2/Models/Network.php
+++ b/src/Networking/v2/Models/Network.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types = 1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Networking\v2\Models;
 
diff --git a/src/Networking/v2/Models/Port.php b/src/Networking/v2/Models/Port.php
index 27bf39f5..f6e24adc 100644
--- a/src/Networking/v2/Models/Port.php
+++ b/src/Networking/v2/Models/Port.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types = 1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Networking\v2\Models;
 
diff --git a/src/Networking/v2/Models/Subnet.php b/src/Networking/v2/Models/Subnet.php
index 8d4ae30c..fc57c6f7 100644
--- a/src/Networking/v2/Models/Subnet.php
+++ b/src/Networking/v2/Models/Subnet.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Networking\v2\Models;
 
diff --git a/src/Networking/v2/Params.php b/src/Networking/v2/Params.php
index 6f63fa1f..dc35505f 100644
--- a/src/Networking/v2/Params.php
+++ b/src/Networking/v2/Params.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types = 1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Networking\v2;
 
diff --git a/src/Networking/v2/Service.php b/src/Networking/v2/Service.php
index 4b7f89e0..3dc80528 100644
--- a/src/Networking/v2/Service.php
+++ b/src/Networking/v2/Service.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Networking\v2;
 
diff --git a/src/ObjectStore/v1/Api.php b/src/ObjectStore/v1/Api.php
index a5b39110..b9aa8619 100644
--- a/src/ObjectStore/v1/Api.php
+++ b/src/ObjectStore/v1/Api.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\ObjectStore\v1;
 
diff --git a/src/ObjectStore/v1/Models/Account.php b/src/ObjectStore/v1/Models/Account.php
index 041deec3..cd280411 100644
--- a/src/ObjectStore/v1/Models/Account.php
+++ b/src/ObjectStore/v1/Models/Account.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\ObjectStore\v1\Models;
 
diff --git a/src/ObjectStore/v1/Models/Container.php b/src/ObjectStore/v1/Models/Container.php
index 26b49c1b..52704546 100644
--- a/src/ObjectStore/v1/Models/Container.php
+++ b/src/ObjectStore/v1/Models/Container.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\ObjectStore\v1\Models;
 
diff --git a/src/ObjectStore/v1/Models/MetadataTrait.php b/src/ObjectStore/v1/Models/MetadataTrait.php
index 94780b69..2adef7f9 100644
--- a/src/ObjectStore/v1/Models/MetadataTrait.php
+++ b/src/ObjectStore/v1/Models/MetadataTrait.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\ObjectStore\v1\Models;
 
diff --git a/src/ObjectStore/v1/Models/Object.php b/src/ObjectStore/v1/Models/Object.php
index a4bbb58f..e122d522 100644
--- a/src/ObjectStore/v1/Models/Object.php
+++ b/src/ObjectStore/v1/Models/Object.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\ObjectStore\v1\Models;
 
diff --git a/src/ObjectStore/v1/Params.php b/src/ObjectStore/v1/Params.php
index cfaf8b9c..44e39594 100644
--- a/src/ObjectStore/v1/Params.php
+++ b/src/ObjectStore/v1/Params.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\ObjectStore\v1;
 
diff --git a/src/ObjectStore/v1/Service.php b/src/ObjectStore/v1/Service.php
index a41d4f07..cd27e5a9 100644
--- a/src/ObjectStore/v1/Service.php
+++ b/src/ObjectStore/v1/Service.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\ObjectStore\v1;
 
diff --git a/src/OpenStack.php b/src/OpenStack.php
index 9c5ac670..0da32699 100644
--- a/src/OpenStack.php
+++ b/src/OpenStack.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack;
 
diff --git a/tests/unit/Common/Error/BuilderTest.php b/tests/unit/Common/Error/BuilderTest.php
index f1d90bd5..0c91e697 100644
--- a/tests/unit/Common/Error/BuilderTest.php
+++ b/tests/unit/Common/Error/BuilderTest.php
@@ -2,12 +2,16 @@
 
 namespace OpenStack\Test\Common\Error;
 
-use function GuzzleHttp\Psr7\{stream_for,str};
+use function GuzzleHttp\Psr7\stream_for;
+use function GuzzleHttp\Psr7\str;
 
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\ClientException;
-use GuzzleHttp\Psr7\{Request,Response};
-use OpenStack\Common\Error\{BadResponseError,Builder,UserInputError};
+use GuzzleHttp\Psr7\Request;
+use GuzzleHttp\Psr7\Response;
+use OpenStack\Common\Error\BadResponseError;
+use OpenStack\Common\Error\Builder;
+use OpenStack\Common\Error\UserInputError;
 
 class BuilderTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/unit/Common/Transport/MiddlewareTest.php b/tests/unit/Common/Transport/MiddlewareTest.php
index 33269595..ac2af2f7 100644
--- a/tests/unit/Common/Transport/MiddlewareTest.php
+++ b/tests/unit/Common/Transport/MiddlewareTest.php
@@ -47,7 +47,8 @@ public function test_responses_are_left_alone_when_status_under_400()
 
     public function test_auth_handler_is_returned()
     {
-        $generator = function () {};
+        $generator = function () {
+        };
 
         $middleware = Middleware::authHandler($generator);
 
diff --git a/tests/unit/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRuleTest.php b/tests/unit/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRuleTest.php
index c75713e7..696a8a27 100644
--- a/tests/unit/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRuleTest.php
+++ b/tests/unit/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRuleTest.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Test\Networking\v2\Extensions\SecurityGroups\Models;
 
diff --git a/tests/unit/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupTest.php b/tests/unit/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupTest.php
index 5daa3a03..c2d2ff7e 100644
--- a/tests/unit/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupTest.php
+++ b/tests/unit/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupTest.php
@@ -1,4 +1,4 @@
-<?php declare (strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenStack\Test\Networking\v2\Extensions\SecurityGroups\Models;