diff --git a/lib/fog/aws/requests/s3/copy_object.rb b/lib/fog/aws/requests/s3/copy_object.rb
index ddb2ec86f..ff6a84cb3 100644
--- a/lib/fog/aws/requests/s3/copy_object.rb
+++ b/lib/fog/aws/requests/s3/copy_object.rb
@@ -28,12 +28,12 @@ unless Fog.mocking?
         def copy_object(source_bucket_name, source_object_name, target_bucket_name, target_object_name, options = {})
           headers = { 'x-amz-copy-source' => "/#{source_bucket_name}/#{source_object_name}" }.merge!(options)
           request({
-            :expects => 200,
-            :headers => headers,
-            :host => "#{target_bucket_name}.#{@host}",
-            :method => 'PUT',
-            :parser => Fog::Parsers::AWS::S3::CopyObject.new,
-            :path => target_object_name
+            :expects  => 200,
+            :headers  => headers,
+            :host     => "#{target_bucket_name}.#{@host}",
+            :method   => 'PUT',
+            :parser   => Fog::Parsers::AWS::S3::CopyObject.new,
+            :path     => target_object_name
           })
         end
 
diff --git a/lib/fog/aws/requests/s3/delete_bucket.rb b/lib/fog/aws/requests/s3/delete_bucket.rb
index 1598f77d2..444ab67a9 100644
--- a/lib/fog/aws/requests/s3/delete_bucket.rb
+++ b/lib/fog/aws/requests/s3/delete_bucket.rb
@@ -14,10 +14,10 @@ unless Fog.mocking?
         #   * status<~Integer> - 204
         def delete_bucket(bucket_name)
           request({
-            :expects => 204,
-            :headers => {},
-            :host => "#{bucket_name}.#{@host}",
-            :method => 'DELETE'
+            :expects  => 204,
+            :headers  => {},
+            :host     => "#{bucket_name}.#{@host}",
+            :method   => 'DELETE'
           })
         end
 
diff --git a/lib/fog/aws/requests/s3/delete_object.rb b/lib/fog/aws/requests/s3/delete_object.rb
index b7d1260eb..cd5d84219 100644
--- a/lib/fog/aws/requests/s3/delete_object.rb
+++ b/lib/fog/aws/requests/s3/delete_object.rb
@@ -15,11 +15,11 @@ unless Fog.mocking?
         #   * status<~Integer> - 204
         def delete_object(bucket_name, object_name)
           request({
-            :expects => 204,
-            :headers => {},
-            :host => "#{bucket_name}.#{@host}",
-            :method => 'DELETE',
-            :path => object_name
+            :expects  => 204,
+            :headers  => {},
+            :host     => "#{bucket_name}.#{@host}",
+            :method   => 'DELETE',
+            :path     => object_name
           })
         end
 
diff --git a/lib/fog/aws/requests/s3/get_bucket.rb b/lib/fog/aws/requests/s3/get_bucket.rb
index 9c6b41b64..982fde8f6 100644
--- a/lib/fog/aws/requests/s3/get_bucket.rb
+++ b/lib/fog/aws/requests/s3/get_bucket.rb
@@ -40,12 +40,12 @@ unless Fog.mocking?
           end
           query.chop!
           request({
-            :expects => 200,
-            :headers => {},
-            :host => "#{bucket_name}.#{@host}",
-            :method => 'GET',
-            :parser => Fog::Parsers::AWS::S3::GetBucket.new,
-            :query => query
+            :expects  => 200,
+            :headers  => {},
+            :host     => "#{bucket_name}.#{@host}",
+            :method   => 'GET',
+            :parser   => Fog::Parsers::AWS::S3::GetBucket.new,
+            :query    => query
           })
         end
 
diff --git a/lib/fog/aws/requests/s3/get_bucket_location.rb b/lib/fog/aws/requests/s3/get_bucket_location.rb
index 3f38c7afb..4ecfd393a 100644
--- a/lib/fog/aws/requests/s3/get_bucket_location.rb
+++ b/lib/fog/aws/requests/s3/get_bucket_location.rb
@@ -15,12 +15,12 @@ unless Fog.mocking?
         #     * 'LocationConstraint'<~String> - Location constraint of the bucket
         def get_bucket_location(bucket_name)
           request({
-            :expects => 200,
-            :headers => {},
-            :host => "#{bucket_name}.#{@host}",
-            :method => 'GET',
-            :parser => Fog::Parsers::AWS::S3::GetBucketLocation.new,
-            :query => 'location'
+            :expects  => 200,
+            :headers  => {},
+            :host     => "#{bucket_name}.#{@host}",
+            :method   => 'GET',
+            :parser   => Fog::Parsers::AWS::S3::GetBucketLocation.new,
+            :query    => 'location'
           })
         end
 
diff --git a/lib/fog/aws/requests/s3/get_object.rb b/lib/fog/aws/requests/s3/get_object.rb
index 1c60a7d0c..4019a4be0 100644
--- a/lib/fog/aws/requests/s3/get_object.rb
+++ b/lib/fog/aws/requests/s3/get_object.rb
@@ -29,11 +29,11 @@ unless Fog.mocking?
           headers['If-Unmodified-Since'] = options['If-Unmodified-Since'].utc.strftime("%a, %d %b %Y %H:%M:%S +0000") if options['If-Modified-Since']
           headers.merge!(options)
           request({
-            :expects => 200,
-            :headers => headers,
-            :host => "#{bucket_name}.#{@host}",
-            :method => 'GET',
-            :path => object_name
+            :expects  => 200,
+            :headers  => headers,
+            :host     => "#{bucket_name}.#{@host}",
+            :method   => 'GET',
+            :path     => object_name
           })
         end
 
diff --git a/lib/fog/aws/requests/s3/get_request_payment.rb b/lib/fog/aws/requests/s3/get_request_payment.rb
index 04e4b5576..22a373b59 100644
--- a/lib/fog/aws/requests/s3/get_request_payment.rb
+++ b/lib/fog/aws/requests/s3/get_request_payment.rb
@@ -15,12 +15,12 @@ unless Fog.mocking?
         #     * 'Payer'<~String> - Specifies who pays for download and requests
         def get_request_payment(bucket_name)
           request({
-            :expects => 200,
-            :headers => {},
-            :host => "#{bucket_name}.#{@host}",
-            :method => 'GET',
-            :parser => Fog::Parsers::AWS::S3::GetRequestPayment.new,
-            :query => 'requestPayment'
+            :expects  => 200,
+            :headers  => {},
+            :host     => "#{bucket_name}.#{@host}",
+            :method   => 'GET',
+            :parser   => Fog::Parsers::AWS::S3::GetRequestPayment.new,
+            :query    => 'requestPayment'
           })
         end
 
diff --git a/lib/fog/aws/requests/s3/get_service.rb b/lib/fog/aws/requests/s3/get_service.rb
index 0b67d1420..89c3a265c 100644
--- a/lib/fog/aws/requests/s3/get_service.rb
+++ b/lib/fog/aws/requests/s3/get_service.rb
@@ -17,12 +17,12 @@ unless Fog.mocking?
         #       * 'ID'<~String> - Id of bucket owner
         def get_service
           request({
-            :expects => 200,
-            :headers => {},
-            :host => @host,
-            :method => 'GET',
-            :parser => Fog::Parsers::AWS::S3::GetService.new,
-            :url => @host
+            :expects  => 200,
+            :headers  => {},
+            :host     => @host,
+            :method   => 'GET',
+            :parser   => Fog::Parsers::AWS::S3::GetService.new,
+            :url      => @host
           })
         end
 
diff --git a/lib/fog/aws/requests/s3/head_object.rb b/lib/fog/aws/requests/s3/head_object.rb
index 4e38d1d79..ddd7286ed 100644
--- a/lib/fog/aws/requests/s3/head_object.rb
+++ b/lib/fog/aws/requests/s3/head_object.rb
@@ -30,11 +30,11 @@ unless Fog.mocking?
           headers['If-Unmodified-Since'] = options['If-Unmodified-Since'].utc.strftime("%a, %d %b %Y %H:%M:%S +0000") if options['If-Modified-Since']
           headers.merge!(options)
           request({
-            :expects => 200,
-            :headers => headers,
-            :host => "#{bucket_name}.#{@host}",
-            :method => 'HEAD',
-            :path => object_name
+            :expects  => 200,
+            :headers  => headers,
+            :host     => "#{bucket_name}.#{@host}",
+            :method   => 'HEAD',
+            :path     => object_name
           })
         end
 
diff --git a/lib/fog/aws/requests/s3/put_bucket.rb b/lib/fog/aws/requests/s3/put_bucket.rb
index a9f7a441b..835641f53 100644
--- a/lib/fog/aws/requests/s3/put_bucket.rb
+++ b/lib/fog/aws/requests/s3/put_bucket.rb
@@ -26,11 +26,11 @@ unless Fog.mocking?
             data = nil
           end
           request({
-            :expects => 200,
-            :body => data,
-            :headers => {},
-            :host => "#{bucket_name}.#{@host}",
-            :method => 'PUT'
+            :expects  => 200,
+            :body     => data,
+            :headers  => {},
+            :host     => "#{bucket_name}.#{@host}",
+            :method   => 'PUT'
           })
         end
 
diff --git a/lib/fog/aws/requests/s3/put_object.rb b/lib/fog/aws/requests/s3/put_object.rb
index 6f41107fb..861e35ee3 100644
--- a/lib/fog/aws/requests/s3/put_object.rb
+++ b/lib/fog/aws/requests/s3/put_object.rb
@@ -28,12 +28,12 @@ unless Fog.mocking?
           file = parse_file(object)
           headers = file[:headers].merge!(options)
           request({
-            :body => file[:body],
-            :expects => 200,
-            :headers => headers,
-            :host => "#{bucket_name}.#{@host}",
-            :method => 'PUT',
-            :path => object_name
+            :body     => file[:body],
+            :expects  => 200,
+            :headers  => headers,
+            :host     => "#{bucket_name}.#{@host}",
+            :method   => 'PUT',
+            :path     => object_name
           })
         end
 
diff --git a/lib/fog/aws/requests/s3/put_request_payment.rb b/lib/fog/aws/requests/s3/put_request_payment.rb
index 839ca6501..bf2d6564b 100644
--- a/lib/fog/aws/requests/s3/put_request_payment.rb
+++ b/lib/fog/aws/requests/s3/put_request_payment.rb
@@ -17,12 +17,12 @@ unless Fog.mocking?
 </RequestPaymentConfiguration>
 DATA
           request({
-            :body => data,
-            :expects => 200,
-            :headers => {},
-            :host => "#{bucket_name}.#{@host}",
-            :method => 'PUT',
-            :query => "requestPayment"
+            :body     => data,
+            :expects  => 200,
+            :headers  => {},
+            :host     => "#{bucket_name}.#{@host}",
+            :method   => 'PUT',
+            :query    => "requestPayment"
           })
         end