diff --git a/composer.json b/composer.json
index 7ace00a..8edcdb1 100644
--- a/composer.json
+++ b/composer.json
@@ -5,11 +5,6 @@
     "require": {
         "guzzlehttp/guzzle": "^6.0"
     },
-    "authors": [
-        {
-            "name": "Vincent Cassé"
-        }
-    ],
     "autoload": {
         "psr-4": {"Ovh\\": "src/"}
     },
diff --git a/src/Api.php b/src/Api.php
index 6b4a5c6..9179113 100644
--- a/src/Api.php
+++ b/src/Api.php
@@ -1,5 +1,5 @@
 <?php
-# Copyright (c) 2013-2014, OVH SAS.
+# Copyright (c) 2013-2016, OVH SAS.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -44,8 +44,6 @@ use GuzzleHttp\Psr7\Response;
  *
  * @package  Ovh
  * @category Ovh
- * @author   Vincent Cassé <vincent.casse@ovh.net>
- * @author   Thierry Goettelmann <thierry@byscripts.info>
  */
 class Api
 {
@@ -144,9 +142,10 @@ class Api
         }
 
         if (!isset($http_client)) {
-            $http_client = new Client();
-            $http_client->setDefaultOption('timeout', 30);
-            $http_client->setDefaultOption('connect_timeout', 5);
+            $http_client = new Client([
+                'timeout'         => 30,
+                'connect_timeout' => 5,
+            ]);
         }
 
         $this->application_key    = $application_key;
diff --git a/src/Exceptions/ApiException.php b/src/Exceptions/ApiException.php
index 5b902bc..7411528 100644
--- a/src/Exceptions/ApiException.php
+++ b/src/Exceptions/ApiException.php
@@ -1,5 +1,5 @@
 <?php
-# Copyright (c) 2013-2014, OVH SAS.
+# Copyright (c) 2013-2016, OVH SAS.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -40,7 +40,6 @@ use Exception;
  *
  * @package Ovh
  * @category Exceptions
- * @author Vincent Cassé <vincent.casse@ovh.net>
  */
 class ApiException extends Exception
 {
diff --git a/src/Exceptions/InvalidParameterException.php b/src/Exceptions/InvalidParameterException.php
index 97f0322..7b10bdf 100644
--- a/src/Exceptions/InvalidParameterException.php
+++ b/src/Exceptions/InvalidParameterException.php
@@ -1,5 +1,5 @@
 <?php
-# Copyright (c) 2013-2014, OVH SAS.
+# Copyright (c) 2013-2016, OVH SAS.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -40,7 +40,6 @@ use Exception;
  *
  * @package Ovh
  * @category Exceptions
- * @author Vincent Cassé <vincent.casse@ovh.net>
  */
 class InvalidParameterException extends Exception
 {
diff --git a/src/Exceptions/NotLoggedException.php b/src/Exceptions/NotLoggedException.php
index f8a2908..6107a9a 100644
--- a/src/Exceptions/NotLoggedException.php
+++ b/src/Exceptions/NotLoggedException.php
@@ -1,5 +1,5 @@
 <?php
-# Copyright (c) 2013-2014, OVH SAS.
+# Copyright (c) 2013-2016, OVH SAS.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,6 @@ use Exception;
  *
  * @package Ovh
  * @category Exceptions
- * @author Vincent Cassé <vincent.casse@ovh.net>
  */
 class NotLoggedException extends Exception
 {
diff --git a/tests/ApiFunctionalTest.php b/tests/ApiFunctionalTest.php
index 61ddb02..651dd8c 100644
--- a/tests/ApiFunctionalTest.php
+++ b/tests/ApiFunctionalTest.php
@@ -1,5 +1,5 @@
 <?php
-# Copyright (c) 2013-2014, OVH SAS.
+# Copyright (c) 2013-2016, OVH SAS.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,6 @@ use Ovh\Api;
  *
  * @package  Ovh
  * @category Ovh
- * @author   Vincent Cassé <vincent.casse@ovh.net>
- * @author   Thierry Goettelmann <thierry@byscripts.info>
  */
 class ApiFunctionalTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/ApiTest.php b/tests/ApiTest.php
index 6a4c8da..a1375bc 100644
--- a/tests/ApiTest.php
+++ b/tests/ApiTest.php
@@ -1,5 +1,5 @@
 <?php
-# Copyright (c) 2013-2014, OVH SAS.
+# Copyright (c) 2013-2016, OVH SAS.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -37,8 +37,6 @@ use Ovh\Api;
  *
  * @package  Ovh
  * @category Ovh
- * @author   Vincent Cassé <vincent.casse@ovh.net>
- * @author   Thierry Goettelmann <thierry@byscripts.info>
  */
 class ApiTest extends \PHPUnit_Framework_TestCase
 {