diff --git a/benchs/parse_vs_push.rb b/benchs/parse_vs_push.rb
index 37d85e475..01bd998c0 100644
--- a/benchs/parse_vs_push.rb
+++ b/benchs/parse_vs_push.rb
@@ -16,6 +16,7 @@ class Parser < Nokogiri::XML::SAX::Document
   end
 
   def characters(string)
+    @value ||= ''
     @value << string.strip
   end
 
@@ -29,10 +30,14 @@ class Parser < Nokogiri::XML::SAX::Document
       @response[:items] << @item
       @item = {}
     when 'key'
-      @item[:key] = @value
+      @item[:key] = value
     end
   end
 
+  def value
+    @value.dup
+  end
+
 end
 
 data = <<-DATA
@@ -43,18 +48,22 @@ data = <<-DATA
 </items>
 DATA
 
-COUNT = 100
+COUNT = 10_000
 
 Benchmark.bmbm(25) do |bench|
   bench.report('parse') do
-    parser = Parser.new
-    Nokogiri::XML::SAX::Parser.new(parser).parse(data)
-    parser.response
+    COUNT.times do
+      parser = Parser.new
+      Nokogiri::XML::SAX::Parser.new(parser).parse(data)
+      parser.response
+    end
   end
 
   bench.report('push') do
-    parser = Parser.new
-    Nokogiri::XML::SAX::PushParser.new(parser).write(data, true)
-    parser.response
+    COUNT.times do
+      parser = Parser.new
+      Nokogiri::XML::SAX::PushParser.new(parser).write(data, true)
+      parser.response
+    end
   end
 end
diff --git a/lib/fog/aws/parsers/cloud_formation/create_stack.rb b/lib/fog/aws/parsers/cloud_formation/create_stack.rb
index e2309bf97..002321423 100644
--- a/lib/fog/aws/parsers/cloud_formation/create_stack.rb
+++ b/lib/fog/aws/parsers/cloud_formation/create_stack.rb
@@ -8,7 +8,7 @@ module Fog
           def end_element(name)
             case name
             when 'RequestId', 'StackId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/cloud_formation/describe_stack_events.rb b/lib/fog/aws/parsers/cloud_formation/describe_stack_events.rb
index 0fc8c8b04..0348f6f4f 100644
--- a/lib/fog/aws/parsers/cloud_formation/describe_stack_events.rb
+++ b/lib/fog/aws/parsers/cloud_formation/describe_stack_events.rb
@@ -13,14 +13,14 @@ module Fog
           def end_element(name)
             case name
             when 'EventId', 'LogicalResourceId', 'PhysicalResourceId', 'ResourceProperties', 'ResourceStatus', 'ResourceStatusReason', 'ResourceType', 'StackId', 'StackName'
-              @event[name] = @value
+              @event[name] = value
             when 'member'
               @response['StackEvents'] << @event
               @event = {}
             when 'RequestId'
-              @response[name] = @value
+              @response[name] = value
             when 'Timestamp'
-              @event[name] = Time.parse(@value)
+              @event[name] = Time.parse(value)
             end
           end
 
diff --git a/lib/fog/aws/parsers/cloud_formation/describe_stack_resources.rb b/lib/fog/aws/parsers/cloud_formation/describe_stack_resources.rb
index 76ee880c3..8b913662c 100644
--- a/lib/fog/aws/parsers/cloud_formation/describe_stack_resources.rb
+++ b/lib/fog/aws/parsers/cloud_formation/describe_stack_resources.rb
@@ -13,14 +13,14 @@ module Fog
           def end_element(name)
             case name
             when 'StackId', 'StackName', 'LogicalResourceId', 'PhysicalResourceId', 'ResourceType', 'ResourceStatus'
-              @resource[name] = @value
+              @resource[name] = value
             when 'member'
               @response['StackResources'] << @resource
               @resource = {}
             when 'RequestId'
-              @response[name] = @value
+              @response[name] = value
             when 'Timestamp'
-              @resource[name] = Time.parse(@value)
+              @resource[name] = Time.parse(value)
             end
           end
 
diff --git a/lib/fog/aws/parsers/cloud_formation/describe_stacks.rb b/lib/fog/aws/parsers/cloud_formation/describe_stacks.rb
index f857785c9..18f9c3fb2 100644
--- a/lib/fog/aws/parsers/cloud_formation/describe_stacks.rb
+++ b/lib/fog/aws/parsers/cloud_formation/describe_stacks.rb
@@ -26,7 +26,7 @@ module Fog
             if @in_outputs
               case name
               when 'OutputKey', 'OutputValue'
-                @output[name] = @value
+                @output[name] = value
               when 'member'
                 @stack['Outputs'] << @output
                 @output = {}
@@ -36,7 +36,7 @@ module Fog
             elsif @in_parameters
               case name
               when 'ParameterKey', 'ParameterValue'
-                @parameter[name] = @value
+                @parameter[name] = value
               when 'member'
                 @stack['Parameters'] << @parameter
                 @parameter = {}
@@ -49,18 +49,18 @@ module Fog
                 @response['Stacks'] << @stack
                 @stack = { 'Outputs' => [], 'Parameters' => [] }
               when 'RequestId'
-                @response[name] = @value
+                @response[name] = value
               when 'CreationTime'
-                @stack[name] = Time.parse(@value)
+                @stack[name] = Time.parse(value)
               when 'DisableRollback'
-                case @value
+                case value
                 when 'false'
                   @stack[name] = false
                 when 'true'
                   @stack[name] = true
                 end
               when 'StackName', 'StackId', 'StackStatus'
-                @stack[name] = @value
+                @stack[name] = value
               end
             end
           end
diff --git a/lib/fog/aws/parsers/cloud_formation/get_template.rb b/lib/fog/aws/parsers/cloud_formation/get_template.rb
index e3b37457f..55830ede7 100644
--- a/lib/fog/aws/parsers/cloud_formation/get_template.rb
+++ b/lib/fog/aws/parsers/cloud_formation/get_template.rb
@@ -8,7 +8,7 @@ module Fog
           def end_element(name)
             case name
             when 'RequestId', 'TemplateBody'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/cloud_formation/validate_template.rb b/lib/fog/aws/parsers/cloud_formation/validate_template.rb
index 410592255..0db472247 100644
--- a/lib/fog/aws/parsers/cloud_formation/validate_template.rb
+++ b/lib/fog/aws/parsers/cloud_formation/validate_template.rb
@@ -21,20 +21,20 @@ module Fog
           def end_element(name)
             case name
             when 'DefaultValue', 'ParameterKey'
-              @parameter[name] = @value
+              @parameter[name] = value
             when 'Description'
               if @in_parameters
-                @parameter[name] = @value
+                @parameter[name] = value
               else
-                @response[name] = @value
+                @response[name] = value
               end
             when 'RequestId'
-              @response[name] = @value
+              @response[name] = value
             when 'member'
               @response['Parameters'] << @parameter
               @parameter = {}
             when 'NoEcho'
-              case @value
+              case value
               when 'false'
                 @parameter[name] = false
               when 'true'
diff --git a/lib/fog/aws/parsers/elb/configure_health_check.rb b/lib/fog/aws/parsers/elb/configure_health_check.rb
index 6764bc9ce..b2934fd70 100644
--- a/lib/fog/aws/parsers/elb/configure_health_check.rb
+++ b/lib/fog/aws/parsers/elb/configure_health_check.rb
@@ -17,15 +17,15 @@ module Fog
           def end_element(name)
             case name
             when 'Target'
-              @health_check[name] = @value
+              @health_check[name] = value
             when 'Interval', 'Timeout', 'UnhealthyThreshold', 'HealthyThreshold'
-              @health_check[name] = @value.to_i
+              @health_check[name] = value.to_i
 
             when 'HealthCheck'
               @response['ConfigureHealthCheckResult'][name] = @health_check
 
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/elb/create_load_balancer.rb b/lib/fog/aws/parsers/elb/create_load_balancer.rb
index a69858c49..27aa2117a 100644
--- a/lib/fog/aws/parsers/elb/create_load_balancer.rb
+++ b/lib/fog/aws/parsers/elb/create_load_balancer.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'DNSName'
-              @response['CreateLoadBalancerResult'][name] = @value
+              @response['CreateLoadBalancerResult'][name] = value
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/elb/delete_load_balancer.rb b/lib/fog/aws/parsers/elb/delete_load_balancer.rb
index cfb946e88..a7aa65072 100644
--- a/lib/fog/aws/parsers/elb/delete_load_balancer.rb
+++ b/lib/fog/aws/parsers/elb/delete_load_balancer.rb
@@ -12,7 +12,7 @@ module Fog
           def end_element(name)
             case name
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/elb/deregister_instances_from_load_balancer.rb b/lib/fog/aws/parsers/elb/deregister_instances_from_load_balancer.rb
index 843612764..170ca53bb 100644
--- a/lib/fog/aws/parsers/elb/deregister_instances_from_load_balancer.rb
+++ b/lib/fog/aws/parsers/elb/deregister_instances_from_load_balancer.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'InstanceId'
-              @response['DeregisterInstancesFromLoadBalancerResult']['Instances'] << {name => @value}
+              @response['DeregisterInstancesFromLoadBalancerResult']['Instances'] << {name => value}
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/elb/describe_instance_health.rb b/lib/fog/aws/parsers/elb/describe_instance_health.rb
index 2c51dfd1f..4c01831bb 100644
--- a/lib/fog/aws/parsers/elb/describe_instance_health.rb
+++ b/lib/fog/aws/parsers/elb/describe_instance_health.rb
@@ -13,12 +13,12 @@ module Fog
           def end_element(name)
             case name
             when 'Description', 'State', 'InstanceId', 'ReasonCode'
-              @instance_state[name] = @value
+              @instance_state[name] = value
             when 'member'
               @response['DescribeInstanceHealthResult']['InstanceStates'] << @instance_state
               @instance_state = {}
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/elb/describe_load_balancers.rb b/lib/fog/aws/parsers/elb/describe_load_balancers.rb
index b01206744..1025b29d5 100644
--- a/lib/fog/aws/parsers/elb/describe_load_balancers.rb
+++ b/lib/fog/aws/parsers/elb/describe_load_balancers.rb
@@ -49,9 +49,9 @@ module Fog
             case name
             when 'member'
               if @in_policy_names
-                @listener_description['PolicyNames'] << @value
+                @listener_description['PolicyNames'] << value
               elsif @in_availability_zones
-                @load_balancer['AvailabilityZones'] << @value
+                @load_balancer['AvailabilityZones'] << value
               elsif @in_listeners
                 @load_balancer['ListenerDescriptions'] << @listener_description
                 reset_listener_description
@@ -67,23 +67,23 @@ module Fog
               end
 
             when 'LoadBalancerName', 'DNSName'
-              @load_balancer[name] = @value
+              @load_balancer[name] = value
             when 'CreatedTime'
-              @load_balancer[name] = Time.parse(@value)
+              @load_balancer[name] = Time.parse(value)
 
             when 'ListenerDescriptions'
               @in_listeners = false
             when 'PolicyNames'
               @in_policy_names = false
             when 'Protocol'
-              @listener_description['Listener'][name] = @value
+              @listener_description['Listener'][name] = value
             when 'LoadBalancerPort', 'InstancePort'
-              @listener_description['Listener'][name] = @value.to_i
+              @listener_description['Listener'][name] = value.to_i
 
             when 'Instances'
               @in_instances = false
             when 'InstanceId'
-              @load_balancer['Instances'] << @value
+              @load_balancer['Instances'] << value
 
             when 'AvailabilityZones'
               @in_availability_zones = false
@@ -96,17 +96,17 @@ module Fog
               @in_lb_cookies = false
 
             when 'Interval', 'HealthyThreshold', 'Timeout', 'UnhealthyThreshold'
-              @load_balancer['HealthCheck'][name] = @value.to_i
+              @load_balancer['HealthCheck'][name] = value.to_i
             when 'Target'
-              @load_balancer['HealthCheck'][name] = @value
+              @load_balancer['HealthCheck'][name] = value
 
             when 'PolicyName', 'CookieName'
-              @policy[name] = @value
+              @policy[name] = value
             when 'CookieExpirationPeriod'
-              @policy[name] = @value.to_i
+              @policy[name] = value.to_i
 
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
 
             when 'DescribeLoadBalancersResponse'
               @response['DescribeLoadBalancersResult'] = @results
diff --git a/lib/fog/aws/parsers/elb/disable_availability_zones_for_load_balancer.rb b/lib/fog/aws/parsers/elb/disable_availability_zones_for_load_balancer.rb
index 4abfb778f..a50f6975e 100644
--- a/lib/fog/aws/parsers/elb/disable_availability_zones_for_load_balancer.rb
+++ b/lib/fog/aws/parsers/elb/disable_availability_zones_for_load_balancer.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'member'
-              @response['DisableAvailabilityZonesForLoadBalancerResult']['AvailabilityZones'] << @value
+              @response['DisableAvailabilityZonesForLoadBalancerResult']['AvailabilityZones'] << value
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/elb/empty.rb b/lib/fog/aws/parsers/elb/empty.rb
index b15d95717..7f344b2b9 100644
--- a/lib/fog/aws/parsers/elb/empty.rb
+++ b/lib/fog/aws/parsers/elb/empty.rb
@@ -16,7 +16,7 @@ module Fog
           def end_element(name)
             case name
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/elb/enable_availability_zones_for_load_balancer.rb b/lib/fog/aws/parsers/elb/enable_availability_zones_for_load_balancer.rb
index cb96c3820..17e2ff998 100644
--- a/lib/fog/aws/parsers/elb/enable_availability_zones_for_load_balancer.rb
+++ b/lib/fog/aws/parsers/elb/enable_availability_zones_for_load_balancer.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'member'
-              @response['EnableAvailabilityZonesForLoadBalancerResult']['AvailabilityZones'] << @value
+              @response['EnableAvailabilityZonesForLoadBalancerResult']['AvailabilityZones'] << value
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/elb/register_instances_with_load_balancer.rb b/lib/fog/aws/parsers/elb/register_instances_with_load_balancer.rb
index 2b1cca32c..083e539f1 100644
--- a/lib/fog/aws/parsers/elb/register_instances_with_load_balancer.rb
+++ b/lib/fog/aws/parsers/elb/register_instances_with_load_balancer.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'InstanceId'
-              @response['RegisterInstancesWithLoadBalancerResult']['Instances'] << {name => @value}
+              @response['RegisterInstancesWithLoadBalancerResult']['Instances'] << {name => value}
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/iam/basic.rb b/lib/fog/aws/parsers/iam/basic.rb
index 10bf5da63..28049bd2b 100644
--- a/lib/fog/aws/parsers/iam/basic.rb
+++ b/lib/fog/aws/parsers/iam/basic.rb
@@ -8,7 +8,7 @@ module Fog
           def end_element(name)
             case name
             when 'RequestId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/iam/create_access_key.rb b/lib/fog/aws/parsers/iam/create_access_key.rb
index f0559ef30..bcf277b1d 100644
--- a/lib/fog/aws/parsers/iam/create_access_key.rb
+++ b/lib/fog/aws/parsers/iam/create_access_key.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'AccessKeyId', 'UserName', 'SecretAccessKey', 'Status'
-              @response['AccessKey'][name] = @value
+              @response['AccessKey'][name] = value
             when 'RequestId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/iam/create_group.rb b/lib/fog/aws/parsers/iam/create_group.rb
index 0e78c980c..a75172db3 100644
--- a/lib/fog/aws/parsers/iam/create_group.rb
+++ b/lib/fog/aws/parsers/iam/create_group.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'Arn', 'GroupId', 'GroupName', 'Path'
-              @response['Group'][name] = @value
+              @response['Group'][name] = value
             when 'RequestId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/iam/create_user.rb b/lib/fog/aws/parsers/iam/create_user.rb
index 1fd26055a..8afa02435 100644
--- a/lib/fog/aws/parsers/iam/create_user.rb
+++ b/lib/fog/aws/parsers/iam/create_user.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'Arn', 'UserId', 'UserName', 'Path'
-              @response['User'][name] = @value
+              @response['User'][name] = value
             when 'RequestId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/iam/get_group.rb b/lib/fog/aws/parsers/iam/get_group.rb
index b79a360b5..de5320b91 100644
--- a/lib/fog/aws/parsers/iam/get_group.rb
+++ b/lib/fog/aws/parsers/iam/get_group.rb
@@ -25,25 +25,25 @@ module Fog
             case name
             when 'Arn'
               if @in_group
-                @response['Group'][name] = @value
+                @response['Group'][name] = value
               elsif @in_users
-                @user[name] = @value
+                @user[name] = value
               end
             when 'Group'
               @in_group = false
             when 'GroupName', 'GroupId'
-              @response['Group'][name] = @value
+              @response['Group'][name] = value
             when 'Users'
               @in_users = false
             when 'UserId', 'UserName', 'Path'
-              @user[name] = @value
+              @user[name] = value
             when 'member'
               @response['Users'] << @user              
               @user = {}
             when 'IsTruncated'	
-              response[name] = (@value == 'true')
+              response[name] = (value == 'true')
             when 'Marker', 'RequestId'              
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/iam/get_user.rb b/lib/fog/aws/parsers/iam/get_user.rb
index 27c58b724..0c3f02936 100644
--- a/lib/fog/aws/parsers/iam/get_user.rb
+++ b/lib/fog/aws/parsers/iam/get_user.rb
@@ -13,9 +13,9 @@ module Fog
           def end_element(name)
             case name
             when 'Arn', 'UserId', 'UserName', 'Path'
-              @response['User'][name] = @value
+              @response['User'][name] = value
             when 'RequestId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/iam/get_user_policy.rb b/lib/fog/aws/parsers/iam/get_user_policy.rb
index 76438bb31..d6a9213d0 100644
--- a/lib/fog/aws/parsers/iam/get_user_policy.rb
+++ b/lib/fog/aws/parsers/iam/get_user_policy.rb
@@ -13,9 +13,9 @@ module Fog
           def end_element(name)
             case name
             when 'UserName', 'PolicyName', 'PolicyDocument'
-              @response[name] = @value
+              @response[name] = value
             when 'RequestId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/iam/list_access_keys.rb b/lib/fog/aws/parsers/iam/list_access_keys.rb
index 2237d9733..2d564492f 100644
--- a/lib/fog/aws/parsers/iam/list_access_keys.rb
+++ b/lib/fog/aws/parsers/iam/list_access_keys.rb
@@ -13,14 +13,14 @@ module Fog
           def end_element(name)
             case name
             when 'AccessKeyId', 'Status', 'Username'
-              @access_key[name] = @value
+              @access_key[name] = value
             when 'member'
               @response['AccessKeys'] << @access_key
               @access_key = {}
             when 'IsTruncated'
-              response[name] = (@value == 'true')
+              response[name] = (value == 'true')
             when 'Marker', 'RequestId'
-              response[name] = @value
+              response[name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/iam/list_groups.rb b/lib/fog/aws/parsers/iam/list_groups.rb
index 921c3b627..b98d11bb0 100644
--- a/lib/fog/aws/parsers/iam/list_groups.rb
+++ b/lib/fog/aws/parsers/iam/list_groups.rb
@@ -13,14 +13,14 @@ module Fog
           def end_element(name)
             case name
             when 'Arn', 'GroupId', 'GroupName', 'Path'
-              @group[name] = @value
+              @group[name] = value
             when 'member'
               @response['Groups'] << @group
               @group = {}
             when 'IsTruncated'
-              response[name] = (@value == 'true')
+              response[name] = (value == 'true')
             when 'Marker', 'RequestId'
-              response[name] = @value
+              response[name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/iam/list_groups_for_user.rb b/lib/fog/aws/parsers/iam/list_groups_for_user.rb
index 1a01b1c9f..6a0e15b8e 100644
--- a/lib/fog/aws/parsers/iam/list_groups_for_user.rb
+++ b/lib/fog/aws/parsers/iam/list_groups_for_user.rb
@@ -13,14 +13,14 @@ module Fog
           def end_element(name)
             case name
             when 'Path', 'GroupName', 'GroupId', 'Arn'
-              @group_for_user[name] = @value
+              @group_for_user[name] = value
             when 'member'
               @response['GroupsForUser'] << @group_for_user
               @group_for_user = {}
             when 'IsTruncated'
-              response[name] = (@value == 'true')
+              response[name] = (value == 'true')
             when 'Marker', 'RequestId'
-              response[name] = @value
+              response[name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/iam/list_policies.rb b/lib/fog/aws/parsers/iam/list_policies.rb
index 3a6d1ab4a..b59d6d666 100644
--- a/lib/fog/aws/parsers/iam/list_policies.rb
+++ b/lib/fog/aws/parsers/iam/list_policies.rb
@@ -12,11 +12,11 @@ module Fog
           def end_element(name)
             case name
             when 'member'
-              @response['PolicyNames'] << @value
+              @response['PolicyNames'] << value
             when 'IsTruncated'
-              response[name] = (@value == 'true')
+              response[name] = (value == 'true')
             when 'Marker', 'RequestId'
-              response[name] = @value
+              response[name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/iam/list_server_certificates.rb b/lib/fog/aws/parsers/iam/list_server_certificates.rb
index b7a7018e6..a9c899e6c 100644
--- a/lib/fog/aws/parsers/iam/list_server_certificates.rb
+++ b/lib/fog/aws/parsers/iam/list_server_certificates.rb
@@ -17,16 +17,16 @@ module Fog
           def end_element(name)
             case name
             when 'Arn', 'Path', 'ServerCertificateId', 'ServerCertificateName'
-              @certificate[name] = @value
+              @certificate[name] = value
             when 'UploadDate'
-              @certificate[name] = Time.parse(@value)
+              @certificate[name] = Time.parse(value)
             when 'member'
               @response['Certificates'] << @certificate
               reset_certificate
             when 'IsTrunctated'
-              @response[name] = !!@value
+              @response[name] = !!value
             when 'Marker'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/iam/list_signing_certificates.rb b/lib/fog/aws/parsers/iam/list_signing_certificates.rb
index 845a16751..e5c693962 100644
--- a/lib/fog/aws/parsers/iam/list_signing_certificates.rb
+++ b/lib/fog/aws/parsers/iam/list_signing_certificates.rb
@@ -13,14 +13,14 @@ module Fog
           def end_element(name)
             case name
             when 'UserName', 'CertificateId', 'CertificateBody', 'Status'
-              @signing_certificate[name] = @value
+              @signing_certificate[name] = value
             when 'member'
               @response['SigningCertificates'] << @signing_certificate
               @signing_certificate = {}
             when 'IsTruncated'
-              response[name] = (@value == 'true')
+              response[name] = (value == 'true')
             when 'Marker', 'RequestId'
-              response[name] = @value
+              response[name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/iam/list_users.rb b/lib/fog/aws/parsers/iam/list_users.rb
index 7e83d6a43..d0d9e0bf4 100644
--- a/lib/fog/aws/parsers/iam/list_users.rb
+++ b/lib/fog/aws/parsers/iam/list_users.rb
@@ -13,14 +13,14 @@ module Fog
           def end_element(name)
             case name
             when 'Arn', 'UserId', 'UserName', 'Path'
-              @user[name] = @value
+              @user[name] = value
             when 'member'
               @response['Users'] << @user
               @user = {}
             when 'IsTruncated'
-              response[name] = (@value == 'true')
+              response[name] = (value == 'true')
             when 'Marker', 'RequestId'
-              response[name] = @value
+              response[name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/iam/login_profile.rb b/lib/fog/aws/parsers/iam/login_profile.rb
index cac198bc1..dddf89ca4 100644
--- a/lib/fog/aws/parsers/iam/login_profile.rb
+++ b/lib/fog/aws/parsers/iam/login_profile.rb
@@ -12,11 +12,11 @@ module Fog
           def end_element(name)
             case name
             when 'UserName'
-              @response['LoginProfile']['UserName'] = @value
+              @response['LoginProfile']['UserName'] = value
             when 'CreateDate'
-              @response['LoginProfile']['CreateDate'] = Time.parse(@value)
+              @response['LoginProfile']['CreateDate'] = Time.parse(value)
             when 'RequestId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/iam/update_group.rb b/lib/fog/aws/parsers/iam/update_group.rb
index 4416443d8..3232db3ba 100644
--- a/lib/fog/aws/parsers/iam/update_group.rb
+++ b/lib/fog/aws/parsers/iam/update_group.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'Arn', 'GroupId', 'GroupName', 'Path'
-              @response['Group'][name] = @value
+              @response['Group'][name] = value
             when 'RequestId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/iam/update_user.rb b/lib/fog/aws/parsers/iam/update_user.rb
index 286fb7a70..a4e4c6de0 100644
--- a/lib/fog/aws/parsers/iam/update_user.rb
+++ b/lib/fog/aws/parsers/iam/update_user.rb
@@ -13,9 +13,9 @@ module Fog
           def end_element(name)
             case name
             when 'Arn', 'UserId', 'UserName', 'Path'
-              @response['User'][name] = @value
+              @response['User'][name] = value
             when 'RequestId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/iam/upload_server_certificate.rb b/lib/fog/aws/parsers/iam/upload_server_certificate.rb
index d3cdc7c54..2fa6be187 100644
--- a/lib/fog/aws/parsers/iam/upload_server_certificate.rb
+++ b/lib/fog/aws/parsers/iam/upload_server_certificate.rb
@@ -12,11 +12,11 @@ module Fog
           def end_element(name)
             case name
             when 'Arn', 'Path', 'ServerCertificateId', 'ServerCertificateName'
-              @response['Certificate'][name] = @value
+              @response['Certificate'][name] = value
             when 'UploadDate'
-              @response['Certificate'][name] = Time.parse(@value)
+              @response['Certificate'][name] = Time.parse(value)
             when 'RequestId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/iam/upload_signing_certificate.rb b/lib/fog/aws/parsers/iam/upload_signing_certificate.rb
index 17402ce18..4f473f7f2 100644
--- a/lib/fog/aws/parsers/iam/upload_signing_certificate.rb
+++ b/lib/fog/aws/parsers/iam/upload_signing_certificate.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'CertificateId', 'UserName', 'CertificateBody', 'Status'
-              @response['Certificate'][name] = @value
+              @response['Certificate'][name] = value
             when 'RequestId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/rds/authorize_db_security_group_ingress.rb b/lib/fog/aws/parsers/rds/authorize_db_security_group_ingress.rb
index 1dcbeaaa3..7b2d2ffbb 100644
--- a/lib/fog/aws/parsers/rds/authorize_db_security_group_ingress.rb
+++ b/lib/fog/aws/parsers/rds/authorize_db_security_group_ingress.rb
@@ -22,7 +22,7 @@ module Fog
               @response['AuthorizeDBSecurityGroupIngressResult']['DBSecurityGroup'] = @security_group
               @security_group = fresh_security_group
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             else
               super
             end
diff --git a/lib/fog/aws/parsers/rds/create_db_instance.rb b/lib/fog/aws/parsers/rds/create_db_instance.rb
index 889a33db5..ab2440772 100644
--- a/lib/fog/aws/parsers/rds/create_db_instance.rb
+++ b/lib/fog/aws/parsers/rds/create_db_instance.rb
@@ -22,7 +22,7 @@ module Fog
               @response['CreateDBInstanceResult']['DBInstance'] = @db_instance
               @db_instance = fresh_instance
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             else
               super
             end
diff --git a/lib/fog/aws/parsers/rds/create_db_instance_read_replica.rb b/lib/fog/aws/parsers/rds/create_db_instance_read_replica.rb
index bb6345251..95c959307 100644
--- a/lib/fog/aws/parsers/rds/create_db_instance_read_replica.rb
+++ b/lib/fog/aws/parsers/rds/create_db_instance_read_replica.rb
@@ -22,7 +22,7 @@ module Fog
               @response['CreateDBInstanceReadReplicaResult']['DBInstance'] = @db_instance
               @db_instance = fresh_instance
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             else
               super
             end
diff --git a/lib/fog/aws/parsers/rds/create_db_parameter_group.rb b/lib/fog/aws/parsers/rds/create_db_parameter_group.rb
index c0ca6c48d..12cdba5d6 100644
--- a/lib/fog/aws/parsers/rds/create_db_parameter_group.rb
+++ b/lib/fog/aws/parsers/rds/create_db_parameter_group.rb
@@ -17,15 +17,15 @@ module Fog
           def end_element(name)
             case name
             when 'DBParameterGroupFamily'
-              @db_parameter_group['DBParameterGroupFamily'] = @value
+              @db_parameter_group['DBParameterGroupFamily'] = value
             when 'Description'
-              @db_parameter_group['Description'] = @value
+              @db_parameter_group['Description'] = value
             when 'DBParameterGroupName'
-              @db_parameter_group['DBParameterGroupName'] = @value
+              @db_parameter_group['DBParameterGroupName'] = value
             when 'DBParameterGroup'
               @response['CreateDBParameterGroupResult']['DBParameterGroup']= @db_parameter_group
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
           end
         end
diff --git a/lib/fog/aws/parsers/rds/create_db_security_group.rb b/lib/fog/aws/parsers/rds/create_db_security_group.rb
index 957f8bb3b..59338968b 100644
--- a/lib/fog/aws/parsers/rds/create_db_security_group.rb
+++ b/lib/fog/aws/parsers/rds/create_db_security_group.rb
@@ -22,7 +22,7 @@ module Fog
               @response['CreateDBSecurityGroupResult']['DBSecurityGroup'] = @security_group
               @security_group = fresh_security_group
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             else
               super
             end
diff --git a/lib/fog/aws/parsers/rds/create_db_snapshot.rb b/lib/fog/aws/parsers/rds/create_db_snapshot.rb
index e9a25ff01..416cc4b00 100644
--- a/lib/fog/aws/parsers/rds/create_db_snapshot.rb
+++ b/lib/fog/aws/parsers/rds/create_db_snapshot.rb
@@ -21,7 +21,7 @@ module Fog
               @response['CreateDBSnapshotResult']['DBSnapshot'] = @db_snapshot
               @db_snapshot = fresh_snapshot
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             else
               super
             end
diff --git a/lib/fog/aws/parsers/rds/db_parser.rb b/lib/fog/aws/parsers/rds/db_parser.rb
index 1c0d1066c..125acf241 100644
--- a/lib/fog/aws/parsers/rds/db_parser.rb
+++ b/lib/fog/aws/parsers/rds/db_parser.rb
@@ -41,14 +41,14 @@ module Fog
             case name
               
             when 'LatestRestorableTime', 'InstanceCreateTime'
-              @db_instance[name] = Time.parse @value
+              @db_instance[name] = Time.parse value
             when 'Engine', 
               'DBInstanceStatus', 'DBInstanceIdentifier', 'EngineVersion', 
               'PreferredBackupWindow', 'PreferredMaintenanceWindow', 
               'AvailabilityZone', 'MasterUsername', 'DBName'
-              @db_instance[name] = @value
+              @db_instance[name] = value
             when 'MultiAZ', 'AutoMinorVersionUpgrade'
-              if @value == 'false'
+              if value == 'false'
                 @db_instance[name] = false
               else
                 @db_instance[name] = true
@@ -61,27 +61,27 @@ module Fog
               @db_parameter_group = {}
             when 'ParameterApplyStatus', 'DBParameterGroupName'
               if @in_db_parameter_groups
-                @db_parameter_group[name] = @value
+                @db_parameter_group[name] = value
               end
             
             when 'BackupRetentionPeriod'
               if @in_pending_modified_values
-                @pending_modified_values[name] = @value.to_i
+                @pending_modified_values[name] = value.to_i
               else
-                @db_instance[name] = @value.to_i
+                @db_instance[name] = value.to_i
               end
             when 'DBInstanceClass', 'EngineVersion', 'MasterUserPassword', 'MultiAZ'
               if @in_pending_modified_values
-                @pending_modified_values[name] = @value
+                @pending_modified_values[name] = value
               else
-                @db_instance[name] = @value
+                @db_instance[name] = value
               end
             when 'DBSecurityGroups'
               @in_db_security_groups = false
               @db_instance['DBSecurityGroups'] = @db_security_groups
             when 'Status', 'DBSecurityGroupName'
               if @in_db_security_groups
-                @db_security_group[name]=@value
+                @db_security_group[name]=value
               end
             when 'DBSecurityGroup'
               @db_security_groups << @db_security_group
@@ -89,17 +89,17 @@ module Fog
             
             when 'AllocatedStorage'
               if @in_pending_modified_values
-                @pending_modified_values[name] = @value.to_i
+                @pending_modified_values[name] = value.to_i
               else
-                @db_instance[name] = @value.to_i
+                @db_instance[name] = value.to_i
               end
             when 'Address'
-              @endpoint[name] = @value
+              @endpoint[name] = value
             when 'Port'
               if @in_pending_modified_values
-                @pending_modified_values[name] = @value.to_i
+                @pending_modified_values[name] = value.to_i
               elsif @in_endpoint
-                @endpoint[name] = @value.to_i
+                @endpoint[name] = value.to_i
               end
       
             when 'PendingModifiedValues'
@@ -109,9 +109,9 @@ module Fog
               @in_endpoint = false
               @db_instance['Endpoint'] = @endpoint
             when 'ReadReplicaDBInstanceIdentifier'
-              @db_instance['ReadReplicaDBInstanceIdentifiers'] << @value
+              @db_instance['ReadReplicaDBInstanceIdentifiers'] << value
             when 'ReadReplicaSourceDBInstanceIdentifier'
-              @db_instance['ReadReplicaSourceDBInstanceIdentifier'] = @value
+              @db_instance['ReadReplicaSourceDBInstanceIdentifier'] = value
             when 'DBInstance'
               @db_instance = fresh_instance
             end
diff --git a/lib/fog/aws/parsers/rds/delete_db_instance.rb b/lib/fog/aws/parsers/rds/delete_db_instance.rb
index 0e02cacbc..64910f447 100644
--- a/lib/fog/aws/parsers/rds/delete_db_instance.rb
+++ b/lib/fog/aws/parsers/rds/delete_db_instance.rb
@@ -23,7 +23,7 @@ module Fog
               @response['DeleteDBInstanceResult']['DBInstance'] = @db_instance
               @db_instance = fresh_instance
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             else
               super
             end
diff --git a/lib/fog/aws/parsers/rds/delete_db_parameter_group.rb b/lib/fog/aws/parsers/rds/delete_db_parameter_group.rb
index d2570fb9f..98cf233bd 100644
--- a/lib/fog/aws/parsers/rds/delete_db_parameter_group.rb
+++ b/lib/fog/aws/parsers/rds/delete_db_parameter_group.rb
@@ -17,7 +17,7 @@ module Fog
           def end_element(name)
             case name
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
           end
         end
diff --git a/lib/fog/aws/parsers/rds/delete_db_security_group.rb b/lib/fog/aws/parsers/rds/delete_db_security_group.rb
index 49131410e..282c7d6ed 100644
--- a/lib/fog/aws/parsers/rds/delete_db_security_group.rb
+++ b/lib/fog/aws/parsers/rds/delete_db_security_group.rb
@@ -18,7 +18,7 @@ module Fog
           def end_element(name)
             case name
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             else
               super
             end
diff --git a/lib/fog/aws/parsers/rds/delete_db_snapshot.rb b/lib/fog/aws/parsers/rds/delete_db_snapshot.rb
index 37f5fc6bd..3d12c38e1 100644
--- a/lib/fog/aws/parsers/rds/delete_db_snapshot.rb
+++ b/lib/fog/aws/parsers/rds/delete_db_snapshot.rb
@@ -19,7 +19,7 @@ module Fog
           def end_element(name)
             case name
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             when 'DBSnapshot'
               @response['DeleteDBSnapshotResult']['DBSnapshot'] = @db_snapshot
               @db_snapshot = fresh_snapshot
diff --git a/lib/fog/aws/parsers/rds/describe_db_instances.rb b/lib/fog/aws/parsers/rds/describe_db_instances.rb
index cebcfe93b..6ec17e1e7 100644
--- a/lib/fog/aws/parsers/rds/describe_db_instances.rb
+++ b/lib/fog/aws/parsers/rds/describe_db_instances.rb
@@ -22,9 +22,9 @@ module Fog
               @response['DescribeDBInstancesResult']['DBInstances'] << @db_instance
               @db_instance = fresh_instance
             when 'Marker'
-              @response['DescribeDBInstancesResult']['Marker'] = @value
+              @response['DescribeDBInstancesResult']['Marker'] = value
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             else
               super
             end
diff --git a/lib/fog/aws/parsers/rds/describe_db_parameter_groups.rb b/lib/fog/aws/parsers/rds/describe_db_parameter_groups.rb
index 5dc2fef34..6dcc387d2 100644
--- a/lib/fog/aws/parsers/rds/describe_db_parameter_groups.rb
+++ b/lib/fog/aws/parsers/rds/describe_db_parameter_groups.rb
@@ -16,16 +16,16 @@ module Fog
 
           def end_element(name)
             case name
-            when 'DBParameterGroupFamily' then @db_parameter_group['DBParameterGroupFamily'] = @value
-            when 'Description' then @db_parameter_group['Description'] = @value
-            when 'DBParameterGroupName' then @db_parameter_group['DBParameterGroupName'] = @value
+            when 'DBParameterGroupFamily' then @db_parameter_group['DBParameterGroupFamily'] = value
+            when 'Description' then @db_parameter_group['Description'] = value
+            when 'DBParameterGroupName' then @db_parameter_group['DBParameterGroupName'] = value
             when 'DBParameterGroup' then 
               @response['DescribeDBParameterGroupsResult']['DBParameterGroups'] << @db_parameter_group
               @db_parameter_group = {}              
             when 'Marker'
-              @response['DescribeDBParameterGroupsResult']['Marker'] = @value
+              @response['DescribeDBParameterGroupsResult']['Marker'] = value
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
 
           end
diff --git a/lib/fog/aws/parsers/rds/describe_db_parameters.rb b/lib/fog/aws/parsers/rds/describe_db_parameters.rb
index 8aadb122f..370d04630 100644
--- a/lib/fog/aws/parsers/rds/describe_db_parameters.rb
+++ b/lib/fog/aws/parsers/rds/describe_db_parameters.rb
@@ -17,24 +17,24 @@ module Fog
 
           def end_element(name)
             case name
-            when 'ParameterValue' then @parameter['ParameterValue'] = @value
-            when 'DataType' then @parameter['DataType'] = @value
-            when 'AllowedValues' then @parameter['AllowedValues'] = @value
-            when 'Source' then @parameter['Source'] = @value
+            when 'ParameterValue' then @parameter['ParameterValue'] = value
+            when 'DataType' then @parameter['DataType'] = value
+            when 'AllowedValues' then @parameter['AllowedValues'] = value
+            when 'Source' then @parameter['Source'] = value
             when 'IsModifiable' then 
-              @parameter['IsModifiable'] =  @value == 'true' ? true : false
-            when 'Description' then @parameter['Description'] = @value
-            when 'ApplyType' then @parameter['ApplyType'] = @value
-            when 'ParameterName' then @parameter['ParameterName'] = @value
+              @parameter['IsModifiable'] =  value == 'true' ? true : false
+            when 'Description' then @parameter['Description'] = value
+            when 'ApplyType' then @parameter['ApplyType'] = value
+            when 'ParameterName' then @parameter['ParameterName'] = value
             when 'Parameter' 
               @parameters << @parameter
               @parameter = {}
             when 'Marker'
-              @response['DescribeDBParametersResult']['Marker'] = @value
+              @response['DescribeDBParametersResult']['Marker'] = value
             when 'Parameters'
               @response['DescribeDBParametersResult']['Parameters'] = @parameters
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
           end
         end
diff --git a/lib/fog/aws/parsers/rds/describe_db_security_groups.rb b/lib/fog/aws/parsers/rds/describe_db_security_groups.rb
index 3670854b9..acb0dd5a8 100644
--- a/lib/fog/aws/parsers/rds/describe_db_security_groups.rb
+++ b/lib/fog/aws/parsers/rds/describe_db_security_groups.rb
@@ -22,9 +22,9 @@ module Fog
               @response['DescribeDBSecurityGroupsResult']['DBSecurityGroups'] << @security_group
               @security_group = fresh_security_group
             when 'Marker'
-              @response['DescribeDBSecurityGroupsResult']['Marker'] = @value
+              @response['DescribeDBSecurityGroupsResult']['Marker'] = value
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             else
               super
             end
diff --git a/lib/fog/aws/parsers/rds/describe_db_snapshots.rb b/lib/fog/aws/parsers/rds/describe_db_snapshots.rb
index 66f52b010..3f68deecd 100644
--- a/lib/fog/aws/parsers/rds/describe_db_snapshots.rb
+++ b/lib/fog/aws/parsers/rds/describe_db_snapshots.rb
@@ -22,9 +22,9 @@ module Fog
               @response['DescribeDBSnapshotsResult']['DBSnapshots'] << @db_snapshot
               @db_snapshot = fresh_snapshot
             when 'Marker'
-              @response['DescribeDBSnapshotsResult']['Marker'] = @value
+              @response['DescribeDBSnapshotsResult']['Marker'] = value
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             else
               super
             end
diff --git a/lib/fog/aws/parsers/rds/modify_db_instance.rb b/lib/fog/aws/parsers/rds/modify_db_instance.rb
index 114e3ca93..90b9d34de 100644
--- a/lib/fog/aws/parsers/rds/modify_db_instance.rb
+++ b/lib/fog/aws/parsers/rds/modify_db_instance.rb
@@ -22,7 +22,7 @@ module Fog
               @response['ModifyDBInstanceResult']['DBInstance'] = @db_instance
               @db_instance = fresh_instance
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             else
               super
             end
diff --git a/lib/fog/aws/parsers/rds/modify_db_parameter_group.rb b/lib/fog/aws/parsers/rds/modify_db_parameter_group.rb
index 6d10cca3d..fd922cb32 100644
--- a/lib/fog/aws/parsers/rds/modify_db_parameter_group.rb
+++ b/lib/fog/aws/parsers/rds/modify_db_parameter_group.rb
@@ -16,9 +16,9 @@ module Fog
           def end_element(name)
             case name
             when 'DBParameterGroupName'
-              @response['ModifyDBParameterGroupResult']['DBParameterGroupName'] = @value
+              @response['ModifyDBParameterGroupResult']['DBParameterGroupName'] = value
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
           end
         end
diff --git a/lib/fog/aws/parsers/rds/reboot_db_instance.rb b/lib/fog/aws/parsers/rds/reboot_db_instance.rb
index e41550c99..c4bbb5a81 100644
--- a/lib/fog/aws/parsers/rds/reboot_db_instance.rb
+++ b/lib/fog/aws/parsers/rds/reboot_db_instance.rb
@@ -23,7 +23,7 @@ module Fog
               @response['RebootDBInstanceResult']['DBInstance'] = @db_instance
               @db_instance = fresh_instance
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             else
               super
             end
diff --git a/lib/fog/aws/parsers/rds/restore_db_instance_from_db_snapshot.rb b/lib/fog/aws/parsers/rds/restore_db_instance_from_db_snapshot.rb
index d0796a852..d022e5d87 100644
--- a/lib/fog/aws/parsers/rds/restore_db_instance_from_db_snapshot.rb
+++ b/lib/fog/aws/parsers/rds/restore_db_instance_from_db_snapshot.rb
@@ -22,7 +22,7 @@ module Fog
               @response['RestoreDBInstanceFromDBSnapshot']['DBInstance'] = @db_instance
               @db_instance = fresh_instance
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             else
               super
             end
diff --git a/lib/fog/aws/parsers/rds/restore_db_instance_to_point_in_time.rb b/lib/fog/aws/parsers/rds/restore_db_instance_to_point_in_time.rb
index 60d009d17..b8482f0af 100644
--- a/lib/fog/aws/parsers/rds/restore_db_instance_to_point_in_time.rb
+++ b/lib/fog/aws/parsers/rds/restore_db_instance_to_point_in_time.rb
@@ -22,7 +22,7 @@ module Fog
               @response['RestoreDBInstanceToPointInTime']['DBInstance'] = @db_instance
               @db_instance = fresh_instance
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             else
               super
             end
diff --git a/lib/fog/aws/parsers/rds/revoke_db_security_group_ingress.rb b/lib/fog/aws/parsers/rds/revoke_db_security_group_ingress.rb
index 39e88dae2..e846ba38e 100644
--- a/lib/fog/aws/parsers/rds/revoke_db_security_group_ingress.rb
+++ b/lib/fog/aws/parsers/rds/revoke_db_security_group_ingress.rb
@@ -22,7 +22,7 @@ module Fog
               @response['RevokeDBSecurityGroupIngressResult']['DBSecurityGroup'] = @security_group
               @security_group = fresh_security_group
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             else
               super
             end
diff --git a/lib/fog/aws/parsers/rds/security_group_parser.rb b/lib/fog/aws/parsers/rds/security_group_parser.rb
index 5f4fd9b88..37317f5eb 100644
--- a/lib/fog/aws/parsers/rds/security_group_parser.rb
+++ b/lib/fog/aws/parsers/rds/security_group_parser.rb
@@ -23,13 +23,13 @@ module Fog
 
           def end_element(name)
             case name
-            when 'DBSecurityGroupDescription' then @security_group['DBSecurityGroupDescription'] = @value
-            when 'DBSecurityGroupName' then @security_group['DBSecurityGroupName'] = @value
-            when 'OwnerId' then @security_group['OwnerId'] = @value
+            when 'DBSecurityGroupDescription' then @security_group['DBSecurityGroupDescription'] = value
+            when 'DBSecurityGroupName' then @security_group['DBSecurityGroupName'] = value
+            when 'OwnerId' then @security_group['OwnerId'] = value
             when 'EC2SecurityGroup', 'IPRange'
               @security_group["#{name}s"] << @ingress unless @ingress.empty?
             when 'EC2SecurityGroupName', 'EC2SecurityGroupOwnerId', 'CIDRIP', 'Status'
-              @ingress[name] = @value
+              @ingress[name] = value
             end
           end
         end
diff --git a/lib/fog/aws/parsers/rds/snapshot_parser.rb b/lib/fog/aws/parsers/rds/snapshot_parser.rb
index 602cd765f..3be89f8b3 100644
--- a/lib/fog/aws/parsers/rds/snapshot_parser.rb
+++ b/lib/fog/aws/parsers/rds/snapshot_parser.rb
@@ -20,17 +20,17 @@ module Fog
 
           def end_element(name)
             case name
-            when 'AllocatedStorage' then @db_snapshot['AllocatedStorage'] = @value.to_i
-            when 'AvailabilityZone' then @db_snapshot['AvailabilityZone'] = @value
-            when 'DBInstanceIdentifier' then @db_snapshot['DBInstanceIdentifier'] = @value
-            when 'DBSnapshotIdentifier' then @db_snapshot['DBSnapshotIdentifier'] = @value
-            when 'Engine' then @db_snapshot['Engine'] = @value
-            when 'EngineVersion' then @db_snapshot['EngineVersion'] = @value
-            when 'InstanceCreateTime' then @db_snapshot['InstanceCreateTime'] = Time.parse @value
-            when 'MasterUsername' then @db_snapshot['MasterUsername'] = @value
-            when 'Port' then @db_snapshot['Port'] = @value.to_i
-            when 'SnapshotCreateTime' then @db_snapshot['SnapshotCreateTime'] = Time.parse @value
-            when 'Status' then @db_snapshot['Status'] = @value
+            when 'AllocatedStorage' then @db_snapshot['AllocatedStorage'] = value.to_i
+            when 'AvailabilityZone' then @db_snapshot['AvailabilityZone'] = value
+            when 'DBInstanceIdentifier' then @db_snapshot['DBInstanceIdentifier'] = value
+            when 'DBSnapshotIdentifier' then @db_snapshot['DBSnapshotIdentifier'] = value
+            when 'Engine' then @db_snapshot['Engine'] = value
+            when 'EngineVersion' then @db_snapshot['EngineVersion'] = value
+            when 'InstanceCreateTime' then @db_snapshot['InstanceCreateTime'] = Time.parse value
+            when 'MasterUsername' then @db_snapshot['MasterUsername'] = value
+            when 'Port' then @db_snapshot['Port'] = value.to_i
+            when 'SnapshotCreateTime' then @db_snapshot['SnapshotCreateTime'] = Time.parse value
+            when 'Status' then @db_snapshot['Status'] = value
             end
           end
         end
diff --git a/lib/fog/aws/parsers/ses/delete_verified_email_address.rb b/lib/fog/aws/parsers/ses/delete_verified_email_address.rb
index ad69ef043..1472b92c2 100644
--- a/lib/fog/aws/parsers/ses/delete_verified_email_address.rb
+++ b/lib/fog/aws/parsers/ses/delete_verified_email_address.rb
@@ -12,7 +12,7 @@ module Fog
           def end_element(name)
             case name
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/ses/get_send_quota.rb b/lib/fog/aws/parsers/ses/get_send_quota.rb
index c063f4336..ffff26744 100644
--- a/lib/fog/aws/parsers/ses/get_send_quota.rb
+++ b/lib/fog/aws/parsers/ses/get_send_quota.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when "Max24HourSend", "MaxSendRate", "SentLast24Hours"
-              @response[name] = @value
+              @response[name] = value
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/ses/get_send_statistics.rb b/lib/fog/aws/parsers/ses/get_send_statistics.rb
index a4176397c..76821e4ed 100644
--- a/lib/fog/aws/parsers/ses/get_send_statistics.rb
+++ b/lib/fog/aws/parsers/ses/get_send_statistics.rb
@@ -13,12 +13,12 @@ module Fog
           def end_element(name)
             case name
             when "Bounces", "Complaints", "DeliveryAttempts", "Rejects", "Timestamp"
-              @send_data_point[name] = @value
+              @send_data_point[name] = value
             when 'member'
               @response['SendDataPoints'] << @send_data_point
               @send_data_point = {}
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
           end
         end
diff --git a/lib/fog/aws/parsers/ses/list_verified_email_addresses.rb b/lib/fog/aws/parsers/ses/list_verified_email_addresses.rb
index f8b8397a2..3ce65d915 100644
--- a/lib/fog/aws/parsers/ses/list_verified_email_addresses.rb
+++ b/lib/fog/aws/parsers/ses/list_verified_email_addresses.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'member'
-              @response['VerifiedEmailAddresses'] << @value
+              @response['VerifiedEmailAddresses'] << value
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
           end
         end
diff --git a/lib/fog/aws/parsers/ses/send_email.rb b/lib/fog/aws/parsers/ses/send_email.rb
index 4a78dcf1a..5d2ec103a 100644
--- a/lib/fog/aws/parsers/ses/send_email.rb
+++ b/lib/fog/aws/parsers/ses/send_email.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'MessageId'
-              @response[name] = @value
+              @response[name] = value
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/ses/send_raw_email.rb b/lib/fog/aws/parsers/ses/send_raw_email.rb
index f513d7a34..e48a8754f 100644
--- a/lib/fog/aws/parsers/ses/send_raw_email.rb
+++ b/lib/fog/aws/parsers/ses/send_raw_email.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'MessageId'
-              @response[name] = @value
+              @response[name] = value
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/ses/verify_email_address.rb b/lib/fog/aws/parsers/ses/verify_email_address.rb
index b0d0fbe19..983a8b4ef 100644
--- a/lib/fog/aws/parsers/ses/verify_email_address.rb
+++ b/lib/fog/aws/parsers/ses/verify_email_address.rb
@@ -12,7 +12,7 @@ module Fog
           def end_element(name)
             case name
             when 'RequestId'
-              @response['ResponseMetadata'][name] = @value
+              @response['ResponseMetadata'][name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/simpledb/basic.rb b/lib/fog/aws/parsers/simpledb/basic.rb
index 8a653e710..b97f24720 100644
--- a/lib/fog/aws/parsers/simpledb/basic.rb
+++ b/lib/fog/aws/parsers/simpledb/basic.rb
@@ -13,9 +13,9 @@ module Fog
           def end_element(name)
             case(name)
             when 'BoxUsage'
-              response[name] = @value.to_f
+              response[name] = value.to_f
             when 'RequestId'
-              response[name] = @value
+              response[name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/simpledb/domain_metadata.rb b/lib/fog/aws/parsers/simpledb/domain_metadata.rb
index 3d9df66ea..5171f0c05 100644
--- a/lib/fog/aws/parsers/simpledb/domain_metadata.rb
+++ b/lib/fog/aws/parsers/simpledb/domain_metadata.rb
@@ -14,13 +14,13 @@ module Fog
           def end_element(name)
             case name
             when 'AttributeNameCount', 'AttributeNamesSizeBytes', 'AttributeValueCount', 'AttributeValuesSizeBytes', 'ItemCount', 'ItemNamesSizeBytes'
-              response[name] = @value.to_i
+              response[name] = value.to_i
             when 'BoxUsage'
-              response[name] = @value.to_f
+              response[name] = value.to_f
             when 'RequestId'
-              response[name] = @value
+              response[name] = value
             when 'Timestamp'
-              response[name] = Time.at(@value.to_i)
+              response[name] = Time.at(value.to_i)
             end
           end
 
diff --git a/lib/fog/aws/parsers/simpledb/get_attributes.rb b/lib/fog/aws/parsers/simpledb/get_attributes.rb
index c1c9ee4ec..ea00b6f71 100644
--- a/lib/fog/aws/parsers/simpledb/get_attributes.rb
+++ b/lib/fog/aws/parsers/simpledb/get_attributes.rb
@@ -17,14 +17,14 @@ module Fog
             when 'Attribute'
               @attribute = nil
             when 'BoxUsage'
-              response[name] = @value.to_f
+              response[name] = value.to_f
             when 'Name'
-              @attribute = @value
+              @attribute = value
               response['Attributes'][@attribute] ||= []
             when 'RequestId'
-              response[name] = @value
+              response[name] = value
             when 'Value'
-              response['Attributes'][@attribute] << sdb_decode(@value)
+              response['Attributes'][@attribute] << sdb_decode(value)
             end
           end
 
diff --git a/lib/fog/aws/parsers/simpledb/list_domains.rb b/lib/fog/aws/parsers/simpledb/list_domains.rb
index 8b1fa3e86..f29412696 100644
--- a/lib/fog/aws/parsers/simpledb/list_domains.rb
+++ b/lib/fog/aws/parsers/simpledb/list_domains.rb
@@ -14,11 +14,11 @@ module Fog
           def end_element(name)
             case(name)
             when 'BoxUsage'
-              response[name] = @value.to_f
+              response[name] = value.to_f
             when 'DomainName'
-              response['Domains'] << @value
+              response['Domains'] << value
             when 'NextToken', 'RequestId'
-              response[name] = @value
+              response[name] = value
             end
           end
 
diff --git a/lib/fog/aws/parsers/simpledb/select.rb b/lib/fog/aws/parsers/simpledb/select.rb
index ce5e5030c..29ad57954 100644
--- a/lib/fog/aws/parsers/simpledb/select.rb
+++ b/lib/fog/aws/parsers/simpledb/select.rb
@@ -15,21 +15,21 @@ module Fog
           def end_element(name)
             case name
             when 'BoxUsage'
-              response[name] = @value.to_f
+              response[name] = value.to_f
             when 'Item'
               @item_name = @attribute_name = nil
             when 'Name'
               if @item_name.nil? 
-                @item_name = @value
+                @item_name = value
                 response['Items'][@item_name] = {}
               else
-                @attribute_name = @value
+                @attribute_name = value
                 response['Items'][@item_name][@attribute_name] ||= []
               end
             when 'NextToken', 'RequestId'
-              response[name] = @value
+              response[name] = value
             when 'Value'
-              response['Items'][@item_name][@attribute_name] << sdb_decode(@value)
+              response['Items'][@item_name][@attribute_name] << sdb_decode(value)
             end
           end
 
diff --git a/lib/fog/cdn/parsers/aws/distribution.rb b/lib/fog/cdn/parsers/aws/distribution.rb
index 0e8b74ea8..a0fa2b530 100644
--- a/lib/fog/cdn/parsers/aws/distribution.rb
+++ b/lib/fog/cdn/parsers/aws/distribution.rb
@@ -21,31 +21,31 @@ module Fog
           def end_element(name)
             case name
             when 'AwsAccountNumber'
-              @response['DistributionConfig']['TrustedSigners'] << @value
+              @response['DistributionConfig']['TrustedSigners'] << value
             when 'Bucket', 'Prefix'
-              @response['DistributionConfig']['Logging'][name] = @value
+              @response['DistributionConfig']['Logging'][name] = value
             when 'CNAME'
-              @response['DistributionConfig']['CNAME'] << @value
+              @response['DistributionConfig']['CNAME'] << value
             when 'DNSName', 'OriginAccessIdentity', 'OriginProtocolPolicy'
-              @response['DistributionConfig'][@origin][name] = @value
+              @response['DistributionConfig'][@origin][name] = value
             when 'DomainName', 'Id', 'Status'
-              @response[name] = @value
+              @response[name] = value
             when 'CallerReference', 'Comment', 'DefaultRootObject', 'Origin', 'OriginAccessIdentity'
-              @response['DistributionConfig'][name] = @value
+              @response['DistributionConfig'][name] = value
             when 'Enabled'
-              if @value == 'true'
+              if value == 'true'
                 @response['DistributionConfig'][name] = true
               else
                 @response['DistributionConfig'][name] = false
               end
             when 'HTTPPort', 'HTTPSPort'
-              @response['DistributionConfig'][@origin][name] = @value.to_i
+              @response['DistributionConfig'][@origin][name] = value.to_i
             when 'InProgressInvalidationBatches'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'LastModifiedTime'
-              @response[name] = Time.parse(@value)
+              @response[name] = Time.parse(value)
             when 'Protocol'
-              @response['DistributionConfig']['RequireProtocols'] = @value
+              @response['DistributionConfig']['RequireProtocols'] = value
             when 'Self'
               @response['DistributionConfig']['TrustedSigners'] << 'Self'
             end
diff --git a/lib/fog/cdn/parsers/aws/get_distribution_list.rb b/lib/fog/cdn/parsers/aws/get_distribution_list.rb
index 3e1a97aab..d539a8a8b 100644
--- a/lib/fog/cdn/parsers/aws/get_distribution_list.rb
+++ b/lib/fog/cdn/parsers/aws/get_distribution_list.rb
@@ -25,31 +25,31 @@ module Fog
               @response['DistributionSummary'] << @distribution_summary
               @distribution_summary = { 'CNAME' => [], 'TrustedSigners' => [] }
             when 'Comment', 'DomainName', 'Id', 'Origin', 'Status'
-              @distribution_summary[name] = @value
+              @distribution_summary[name] = value
             when 'CNAME'
-              @distribution_summary[name] << @value
+              @distribution_summary[name] << value
             when 'DNSName', 'OriginAccessIdentity', 'OriginProtocolPolicy'
-              @distribution_summary[@origin][name] = @value
+              @distribution_summary[@origin][name] = value
             when 'Enabled'
-              if @value == 'true'
+              if value == 'true'
                 @distribution_summary[name] = true
               else
                 @distribution_summary[name] = false
               end
             when 'HTTPPort', 'HTTPSPort'
-              @distribution_summary[@origin][name] = @value.to_i
+              @distribution_summary[@origin][name] = value.to_i
             when 'LastModifiedTime'
-              @distribution_summary[name] = Time.parse(@value)
+              @distribution_summary[name] = Time.parse(value)
             when 'IsTruncated'
-              if @value == 'true'
+              if value == 'true'
                 @response[name] = true
               else
                 @response[name] = false
               end
             when 'Marker', 'NextMarker'
-              @response[name] = @value
+              @response[name] = value
             when 'MaxItems'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             end
           end
 
diff --git a/lib/fog/cdn/parsers/aws/post_invalidation.rb b/lib/fog/cdn/parsers/aws/post_invalidation.rb
index 653ad3743..27cc54203 100644
--- a/lib/fog/cdn/parsers/aws/post_invalidation.rb
+++ b/lib/fog/cdn/parsers/aws/post_invalidation.rb
@@ -12,11 +12,11 @@ module Fog
           def end_element(name)
             case name
             when 'CallerReference'
-              @response['InvalidationBatch'][name] = @value
+              @response['InvalidationBatch'][name] = value
             when 'CreateTime', 'Id', 'Status'
-              @response[name] = @value
+              @response[name] = value
             when 'Path'
-              @response['InvalidationBatch'][name] << @value
+              @response['InvalidationBatch'][name] << value
             end
           end
 
diff --git a/lib/fog/compute/parsers/aws/allocate_address.rb b/lib/fog/compute/parsers/aws/allocate_address.rb
index e655c90a5..40fcfefcf 100644
--- a/lib/fog/compute/parsers/aws/allocate_address.rb
+++ b/lib/fog/compute/parsers/aws/allocate_address.rb
@@ -8,7 +8,7 @@ module Fog
           def end_element(name)
             case name
             when 'publicIp', 'requestId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/compute/parsers/aws/attach_volume.rb b/lib/fog/compute/parsers/aws/attach_volume.rb
index 4bb8150f0..9293cae4f 100644
--- a/lib/fog/compute/parsers/aws/attach_volume.rb
+++ b/lib/fog/compute/parsers/aws/attach_volume.rb
@@ -8,9 +8,9 @@ module Fog
           def end_element(name)
             case name
             when 'attachTime'
-              @response[name] = Time.parse(@value)
+              @response[name] = Time.parse(value)
             when 'device', 'instanceId', 'requestId', 'status', 'volumeId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/compute/parsers/aws/basic.rb b/lib/fog/compute/parsers/aws/basic.rb
index f591d96df..4affa6102 100644
--- a/lib/fog/compute/parsers/aws/basic.rb
+++ b/lib/fog/compute/parsers/aws/basic.rb
@@ -8,9 +8,9 @@ module Fog
           def end_element(name)
             case name
             when 'requestId'
-              @response[name] = @value
+              @response[name] = value
             when 'return'
-              if @value == 'true'
+              if value == 'true'
                 @response[name] = true
               else
                 @response[name] = false
diff --git a/lib/fog/compute/parsers/aws/create_image.rb b/lib/fog/compute/parsers/aws/create_image.rb
index 57ee677d5..a008fb2aa 100644
--- a/lib/fog/compute/parsers/aws/create_image.rb
+++ b/lib/fog/compute/parsers/aws/create_image.rb
@@ -8,7 +8,7 @@ module Fog
           def end_element(name)
             case name
             when 'instanceId', 'requestId', 'name', 'description', 'noReboot', 'imageId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/compute/parsers/aws/create_key_pair.rb b/lib/fog/compute/parsers/aws/create_key_pair.rb
index 9fc8bd530..a575c1bb4 100644
--- a/lib/fog/compute/parsers/aws/create_key_pair.rb
+++ b/lib/fog/compute/parsers/aws/create_key_pair.rb
@@ -8,7 +8,7 @@ module Fog
           def end_element(name)
             case name
             when 'keyFingerprint', 'keyMaterial', 'keyName', 'requestId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/compute/parsers/aws/create_snapshot.rb b/lib/fog/compute/parsers/aws/create_snapshot.rb
index e506a395c..6a36a3f4c 100644
--- a/lib/fog/compute/parsers/aws/create_snapshot.rb
+++ b/lib/fog/compute/parsers/aws/create_snapshot.rb
@@ -8,13 +8,13 @@ module Fog
           def end_element(name)
             case name
             when 'description', 'ownerId', 'progress', 'snapshotId', 'status', 'volumeId'
-              @response[name] = @value
+              @response[name] = value
             when 'requestId'
-              @response[name] = @value
+              @response[name] = value
             when 'startTime'
-              @response[name] = Time.parse(@value)
+              @response[name] = Time.parse(value)
             when 'volumeSize'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             end
           end
 
diff --git a/lib/fog/compute/parsers/aws/create_volume.rb b/lib/fog/compute/parsers/aws/create_volume.rb
index 8b4263def..e75fa9ba1 100644
--- a/lib/fog/compute/parsers/aws/create_volume.rb
+++ b/lib/fog/compute/parsers/aws/create_volume.rb
@@ -8,11 +8,11 @@ module Fog
           def end_element(name)
             case name
             when 'availabilityZone', 'requestId', 'snapshotId', 'status', 'volumeId'
-              @response[name] = @value
+              @response[name] = value
             when 'createTime'
-              @response[name] = Time.parse(@value)
+              @response[name] = Time.parse(value)
             when 'size'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             end
           end
 
diff --git a/lib/fog/compute/parsers/aws/deregister_image.rb b/lib/fog/compute/parsers/aws/deregister_image.rb
index 697c124ff..cf64b947e 100644
--- a/lib/fog/compute/parsers/aws/deregister_image.rb
+++ b/lib/fog/compute/parsers/aws/deregister_image.rb
@@ -8,7 +8,7 @@ module Fog
           def end_element(name)
             case name
             when 'return', 'requestId', 'imageId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/compute/parsers/aws/describe_addresses.rb b/lib/fog/compute/parsers/aws/describe_addresses.rb
index 51087f6b5..77c6717f5 100644
--- a/lib/fog/compute/parsers/aws/describe_addresses.rb
+++ b/lib/fog/compute/parsers/aws/describe_addresses.rb
@@ -13,12 +13,12 @@ module Fog
           def end_element(name)
             case name
             when 'instanceId', 'publicIp'
-              @address[name] = @value
+              @address[name] = value
             when 'item'
               @response['addressesSet'] << @address
               @address = {}
             when 'requestId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/compute/parsers/aws/describe_availability_zones.rb b/lib/fog/compute/parsers/aws/describe_availability_zones.rb
index aef23644a..b25061efb 100644
--- a/lib/fog/compute/parsers/aws/describe_availability_zones.rb
+++ b/lib/fog/compute/parsers/aws/describe_availability_zones.rb
@@ -16,11 +16,11 @@ module Fog
               @response['availabilityZoneInfo'] << @availability_zone
               @availability_zone = { 'messageSet' => [] }
             when 'message'
-              @availability_zone['messageSet'] << @value
+              @availability_zone['messageSet'] << value
             when 'regionName', 'zoneName', 'zoneState'
-              @availability_zone[name] = @value
+              @availability_zone[name] = value
             when 'requestId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/compute/parsers/aws/describe_images.rb b/lib/fog/compute/parsers/aws/describe_images.rb
index 58634938c..c7b6941a0 100644
--- a/lib/fog/compute/parsers/aws/describe_images.rb
+++ b/lib/fog/compute/parsers/aws/describe_images.rb
@@ -29,7 +29,7 @@ module Fog
                   @image['tagSet'][@tag['key']] = @tag['value']
                   @tag = {}
                 when 'key', 'value'
-                  @tag[name] = @value
+                  @tag[name] = value
                 when 'tagSet'
                   @in_tag_set = false
               end
@@ -38,9 +38,9 @@ module Fog
                 when 'blockDeviceMapping'
                   @in_block_device_mapping = false
                 when 'deviceName', 'virtualName', 'snapshotId', 'deleteOnTermination'
-                  @block_device_mapping[name] = @value
+                  @block_device_mapping[name] = value
                 when 'volumeSize'
-                  @block_device_mapping[name] = @value.to_i
+                  @block_device_mapping[name] = value.to_i
                 when 'item'
                   @image['blockDeviceMapping'] << @block_device_mapping
                   @block_device_mapping = {}
@@ -48,9 +48,9 @@ module Fog
             else
               case name
               when 'architecture', 'description', 'imageId', 'imageLocation', 'imageOwnerId', 'imageState', 'imageType', 'kernelId', 'name', 'platform', 'ramdiskId', 'rootDeviceType','rootDeviceName','virtualizationType'
-                @image[name] = @value
+                @image[name] = value
               when 'isPublic'
-                if @value == 'true'
+                if value == 'true'
                   @image[name] = true
                 else
                   @image[name] = false
@@ -59,9 +59,9 @@ module Fog
                 @response['imagesSet'] << @image
                 @image = { 'blockDeviceMapping' => [], 'productCodes' => [], 'tagSet' => {} }
               when 'productCode'
-                @image['productCodes'] << @value
+                @image['productCodes'] << value
               when 'requestId'
-                @response[name] = @value
+                @response[name] = value
               end
             end
           end
diff --git a/lib/fog/compute/parsers/aws/describe_instances.rb b/lib/fog/compute/parsers/aws/describe_instances.rb
index 484419909..478b6c5a0 100644
--- a/lib/fog/compute/parsers/aws/describe_instances.rb
+++ b/lib/fog/compute/parsers/aws/describe_instances.rb
@@ -34,34 +34,34 @@ module Fog
           def end_element(name)
             case name
             when 'amiLaunchIndex'
-              @instance[name] = @value.to_i
+              @instance[name] = value.to_i
             when 'availabilityZone'
-              @instance['placement'][name] = @value
+              @instance['placement'][name] = value
             when 'architecture', 'clientToken', 'dnsName', 'imageId',
                   'instanceId', 'instanceType', 'ipAddress', 'kernelId',
                   'keyName', 'privateDnsName', 'privateIpAddress', 'ramdiskId',
                   'reason', 'rootDeviceType'
-              @instance[name] = @value
+              @instance[name] = value
             when 'attachTime'
-              @block_device_mapping[name] = Time.parse(@value)
+              @block_device_mapping[name] = Time.parse(value)
             when 'blockDeviceMapping'
               @in_block_device_mapping = false
             when 'code'
               if @in_instance_state
-                @instance['instanceState'][name] = @value.to_i
+                @instance['instanceState'][name] = value.to_i
               elsif @in_state_reason
-                @instance['stateReason'][name] = @value.to_i
+                @instance['stateReason'][name] = value.to_i
               end
             when 'deleteOnTermination'
-              if @value == 'true'
+              if value == 'true'
                 @block_device_mapping[name] = true
               else
                 @block_device_mapping[name] = false
               end
             when 'deviceName', 'status', 'volumeId'
-              @block_device_mapping[name] = @value
+              @block_device_mapping[name] = value
             when 'groupId'
-              @reservation['groupSet'] << @value
+              @reservation['groupSet'] << value
             when 'groupSet', 'productCodes'
               @in_subset = false
             when 'instancesSet'
@@ -83,23 +83,23 @@ module Fog
                 @reservation = { 'groupSet' => [], 'instancesSet' => [] }
               end
             when 'key', 'value'
-              @tag[name] = @value
+              @tag[name] = value
             when 'launchTime'
-              @instance[name] = Time.parse(@value)
+              @instance[name] = Time.parse(value)
             when 'name'
               if @in_instance_state
-                @instance['instanceState'][name] = @value
+                @instance['instanceState'][name] = value
               elsif @in_state_reason
-                @instance['stateReason'][name] = @value
+                @instance['stateReason'][name] = value
               end
             when 'ownerId', 'reservationId'
-              @reservation[name] = @value
+              @reservation[name] = value
             when 'requestId'
-              @response[name] = @value
+              @response[name] = value
             when 'productCode'
-              @instance['productCodes'] << @value
+              @instance['productCodes'] << value
             when 'state'
-              if @value == 'true'
+              if value == 'true'
                 @instance['monitoring'][name] = true
               else
                 @instance['monitoring'][name] = false
diff --git a/lib/fog/compute/parsers/aws/describe_key_pairs.rb b/lib/fog/compute/parsers/aws/describe_key_pairs.rb
index d62746b32..40cca225d 100644
--- a/lib/fog/compute/parsers/aws/describe_key_pairs.rb
+++ b/lib/fog/compute/parsers/aws/describe_key_pairs.rb
@@ -16,9 +16,9 @@ module Fog
               @response['keySet'] << @key
               @key = {}
             when 'keyFingerprint', 'keyName'
-              @key[name] = @value
+              @key[name] = value
             when 'requestId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/compute/parsers/aws/describe_regions.rb b/lib/fog/compute/parsers/aws/describe_regions.rb
index fe93ef49b..279cd3855 100644
--- a/lib/fog/compute/parsers/aws/describe_regions.rb
+++ b/lib/fog/compute/parsers/aws/describe_regions.rb
@@ -16,9 +16,9 @@ module Fog
               @response['regionInfo'] << @region
               @region = {}
             when 'regionEndpoint', 'regionName'
-              @region[name] = @value
+              @region[name] = value
             when 'requestId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/compute/parsers/aws/describe_reserved_instances.rb b/lib/fog/compute/parsers/aws/describe_reserved_instances.rb
index 4452ebd9d..7e9b2ea7e 100644
--- a/lib/fog/compute/parsers/aws/describe_reserved_instances.rb
+++ b/lib/fog/compute/parsers/aws/describe_reserved_instances.rb
@@ -13,18 +13,18 @@ module Fog
           def end_element(name)
             case name
             when 'availabilityZone', 'instanceType', 'productDescription', 'reservedInstancesId', 'state'
-              @reserved_instance[name] = @value
+              @reserved_instance[name] = value
             when 'duration', 'instanceCount'
-              @reserved_instance[name] = @value.to_i
+              @reserved_instance[name] = value.to_i
             when 'fixedPrice', 'usagePrice'
-              @reserved_instance[name] = @value.to_f
+              @reserved_instance[name] = value.to_f
             when 'item'
               @response['reservedInstancesSet'] << @reserved_instance
               @reserved_instance = {}
             when 'requestId'
-              @response[name] = @value
+              @response[name] = value
             when 'start'
-              @response[name] = Time.parse(@value)
+              @response[name] = Time.parse(value)
             end
           end
 
diff --git a/lib/fog/compute/parsers/aws/describe_reserved_instances_offerings.rb b/lib/fog/compute/parsers/aws/describe_reserved_instances_offerings.rb
index 0d9c76ff4..1ae25dc01 100644
--- a/lib/fog/compute/parsers/aws/describe_reserved_instances_offerings.rb
+++ b/lib/fog/compute/parsers/aws/describe_reserved_instances_offerings.rb
@@ -13,16 +13,16 @@ module Fog
           def end_element(name)
             case name
             when 'availabilityZone', 'instanceType', 'productDescription', 'reservedInstancesOfferingId'
-              @reserved_instances_offering[name] = @value
+              @reserved_instances_offering[name] = value
             when 'duration'
-              @reserved_instances_offering[name] = @value.to_i
+              @reserved_instances_offering[name] = value.to_i
             when 'fixedPrice', 'usagePrice'
-              @reserved_instances_offering[name] = @value.to_f
+              @reserved_instances_offering[name] = value.to_f
             when 'item'
               @response['reservedInstancesOfferingsSet'] << @reserved_instances_offering
               @reserved_instances_offering = {}
             when 'requestId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/compute/parsers/aws/describe_security_groups.rb b/lib/fog/compute/parsers/aws/describe_security_groups.rb
index 225fed4c2..e2dca7bdc 100644
--- a/lib/fog/compute/parsers/aws/describe_security_groups.rb
+++ b/lib/fog/compute/parsers/aws/describe_security_groups.rb
@@ -28,23 +28,23 @@ module Fog
           def end_element(name)
             case name
             when 'cidrIp'
-              @ip_range[name] = @value
+              @ip_range[name] = value
             when 'fromPort', 'toPort'
-              @ip_permission[name] = @value.to_i
+              @ip_permission[name] = value.to_i
             when 'groups'
               @in_groups = false
             when 'groupDescription', 'ownerId'
-              @security_group[name] = @value
+              @security_group[name] = value
             when 'groupName'
               if @in_groups
-                @group[name] = @value
+                @group[name] = value
               else
-                @security_group[name] = @value
+                @security_group[name] = value
               end
             when 'ipPermissions'
               @in_ip_permissions = false
             when 'ipProtocol'
-              @ip_permission[name] = @value
+              @ip_permission[name] = value
             when 'ipRanges'
               @in_ip_ranges = false
             when 'item'
@@ -62,9 +62,9 @@ module Fog
                 @security_group = { 'ipPermissions' => [] }
               end
             when 'requestId'
-              @response[name] = @value
+              @response[name] = value
             when 'userId'
-              @group[name] = @value
+              @group[name] = value
             end
           end
 
diff --git a/lib/fog/compute/parsers/aws/describe_snapshots.rb b/lib/fog/compute/parsers/aws/describe_snapshots.rb
index 7e5b27560..58244edcb 100644
--- a/lib/fog/compute/parsers/aws/describe_snapshots.rb
+++ b/lib/fog/compute/parsers/aws/describe_snapshots.rb
@@ -25,7 +25,7 @@ module Fog
                 @snapshot['tagSet'][@tag['key']] = @tag['value']
                 @tag = {}
               when 'key', 'value'
-                @tag[name] = @value
+                @tag[name] = value
               when 'tagSet'
                 @in_tag_set = false
               end
@@ -35,13 +35,13 @@ module Fog
                 @response['snapshotSet'] << @snapshot
                 @snapshot = { 'tagSet' => {} }
               when 'description', 'ownerId', 'progress', 'snapshotId', 'status', 'volumeId'
-                @snapshot[name] ||= @value
+                @snapshot[name] ||= value
               when 'requestId'
-                @response[name] = @value
+                @response[name] = value
               when 'startTime'
-                @snapshot[name] = Time.parse(@value)
+                @snapshot[name] = Time.parse(value)
               when 'volumeSize'
-                @snapshot[name] = @value.to_i
+                @snapshot[name] = value.to_i
               end
             end
           end
diff --git a/lib/fog/compute/parsers/aws/describe_tags.rb b/lib/fog/compute/parsers/aws/describe_tags.rb
index e52bcc121..3d8167d75 100644
--- a/lib/fog/compute/parsers/aws/describe_tags.rb
+++ b/lib/fog/compute/parsers/aws/describe_tags.rb
@@ -13,12 +13,12 @@ module Fog
           def end_element(name)
             case name
             when 'resourceId', 'resourceType', 'key', 'value'
-              @tag[name] = @value
+              @tag[name] = value
             when 'item'
               @response['tagSet'] << @tag
               @tag = {}
             when 'requestId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/compute/parsers/aws/describe_volumes.rb b/lib/fog/compute/parsers/aws/describe_volumes.rb
index a0e8bb90f..731030b2e 100644
--- a/lib/fog/compute/parsers/aws/describe_volumes.rb
+++ b/lib/fog/compute/parsers/aws/describe_volumes.rb
@@ -29,11 +29,11 @@ module Fog
               when 'attachmentSet'
                 @in_attachment_set = false
               when 'attachTime'
-                @attachment[name] = Time.parse(@value)
+                @attachment[name] = Time.parse(value)
               when 'deleteOnTermination'
-                @attachment[name] = @value == 'true'
+                @attachment[name] = value == 'true'
               when 'device', 'instanceId', 'status', 'volumeId'
-                @attachment[name] = @value
+                @attachment[name] = value
               when 'item'
                 @volume['attachmentSet'] << @attachment
                 @attachment = {}
@@ -41,7 +41,7 @@ module Fog
             elsif @in_tag_set
               case name
               when 'key', 'value'
-                @tag[name] = @value
+                @tag[name] = value
               when 'item'
                 @volume['tagSet'][@tag['key']] = @tag['value']
                 @tag = {}
@@ -51,16 +51,16 @@ module Fog
             else
               case name
               when 'availabilityZone', 'snapshotId', 'status', 'volumeId'
-                @volume[name] = @value
+                @volume[name] = value
               when 'createTime'
-                @volume[name] = Time.parse(@value)
+                @volume[name] = Time.parse(value)
               when 'item'
                 @response['volumeSet'] << @volume
                 @volume = { 'attachmentSet' => [], 'tagSet' => {} }
               when 'requestId'
-                @response[name] = @value
+                @response[name] = value
               when 'size'
-                @volume[name] = @value.to_i
+                @volume[name] = value.to_i
               end
             end
           end
diff --git a/lib/fog/compute/parsers/aws/detach_volume.rb b/lib/fog/compute/parsers/aws/detach_volume.rb
index 54b382485..e34c2019c 100644
--- a/lib/fog/compute/parsers/aws/detach_volume.rb
+++ b/lib/fog/compute/parsers/aws/detach_volume.rb
@@ -8,9 +8,9 @@ module Fog
           def end_element(name)
             case name
             when 'attachTime'
-              @response[name] = Time.parse(@value)
+              @response[name] = Time.parse(value)
             when 'device', 'instanceId', 'requestId', 'status', 'volumeId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/compute/parsers/aws/get_console_output.rb b/lib/fog/compute/parsers/aws/get_console_output.rb
index 1315735f3..893a65fd9 100644
--- a/lib/fog/compute/parsers/aws/get_console_output.rb
+++ b/lib/fog/compute/parsers/aws/get_console_output.rb
@@ -12,15 +12,11 @@ module Fog
           def end_element(name)
             case name
             when 'instanceId', 'requestId'
-              @response[name] = @value
+              @response[name] = value
             when 'output'
-              @response[name] = if @value
-                Base64.decode64(@value)
-              else
-                nil
-              end
+              @response[name] = value && Base64.decode64(value)
             when 'timestamp'
-              @response[name] = Time.parse(@value)
+              @response[name] = Time.parse(value)
             end
           end
 
diff --git a/lib/fog/compute/parsers/aws/import_key_pair.rb b/lib/fog/compute/parsers/aws/import_key_pair.rb
index 0aebc0b0e..9d30954f9 100644
--- a/lib/fog/compute/parsers/aws/import_key_pair.rb
+++ b/lib/fog/compute/parsers/aws/import_key_pair.rb
@@ -8,7 +8,7 @@ module Fog
           def end_element(name)
             case name
             when 'keyFingerprint', 'keyName', 'requestId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/compute/parsers/aws/monitor_unmonitor_instances.rb b/lib/fog/compute/parsers/aws/monitor_unmonitor_instances.rb
index 507e26af0..89fc5f722 100644
--- a/lib/fog/compute/parsers/aws/monitor_unmonitor_instances.rb
+++ b/lib/fog/compute/parsers/aws/monitor_unmonitor_instances.rb
@@ -14,14 +14,14 @@ module Fog
           def end_element(name)
             case name
             when 'requestId'
-              @response['requestId'] = @value
+              @response['requestId'] = value
             when 'instanceId'
-              @current_instance_set['instanceId'] = @value
+              @current_instance_set['instanceId'] = value
             when 'item'
               @instance_set << @current_instance_set
               @current_instance_set = {}
             when 'state'
-              @current_instance_set['monitoring'] = @value
+              @current_instance_set['monitoring'] = value
             when 'instancesSet'
               @response['instancesSet'] = @instance_set
             end
diff --git a/lib/fog/compute/parsers/aws/register_image.rb b/lib/fog/compute/parsers/aws/register_image.rb
index 8db68cff2..03e9c91bf 100644
--- a/lib/fog/compute/parsers/aws/register_image.rb
+++ b/lib/fog/compute/parsers/aws/register_image.rb
@@ -8,7 +8,7 @@ module Fog
           def end_element(name)
             case name
             when 'requestId', 'imageId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/compute/parsers/aws/run_instances.rb b/lib/fog/compute/parsers/aws/run_instances.rb
index 399a72078..9edf010fa 100644
--- a/lib/fog/compute/parsers/aws/run_instances.rb
+++ b/lib/fog/compute/parsers/aws/run_instances.rb
@@ -26,30 +26,26 @@ module Fog
           def end_element(name)
             case name
             when 'amiLaunchIndex'
-              @instance[name] = @value.to_i
+              @instance[name] = value.to_i
             when 'architecture', 'clientToken', 'dnsName', 'imageId',
                   'instanceId', 'instanceType', 'ipAddress', 'kernelId',
                   'keyName', 'privateDnsName', 'privateIpAddress', 'ramdiskId',
                   'reason', 'rootDeviceType'
-              @instance[name] = @value
+              @instance[name] = value
             when 'availabilityZone'
-              @instance['placement'][name] = @value
+              @instance['placement'][name] = value
             when 'attachTime'
-              @block_device_mapping[name] = Time.parse(@value)
+              @block_device_mapping[name] = Time.parse(value)
             when 'blockDeviceMapping'
               @in_block_device_mapping = false
             when 'code'
-              @instance['instanceState'][name] = @value.to_i
+              @instance['instanceState'][name] = value.to_i
             when 'deleteOnTermination'
-              if @value == 'true'
-                @block_device_mapping[name] = true
-              else
-                @block_device_mapping[name] = false
-              end
+              @block_device_mapping[name] = (value == 'true')
             when 'deviceName', 'status', 'volumeId'
-              @block_device_mapping[name] = @value
+              @block_device_mapping[name] = value
             when 'groupId'
-              @response['groupSet'] << @value
+              @response['groupSet'] << value
             when 'groupSet'
               @in_group_set = false
             when 'item'
@@ -61,23 +57,19 @@ module Fog
                 @instance = { 'blockDeviceMapping' => [], 'instanceState' => {}, 'monitoring' => {}, 'placement' => {}, 'productCodes' => [] }
               end
             when 'launchTime'
-              @instance[name] = Time.parse(@value)
+              @instance[name] = Time.parse(value)
             when 'name'
-              @instance['instanceState'][name] = @value
+              @instance['instanceState'][name] = value
             when 'ownerId', 'requestId', 'reservationId'
-              @response[name] = @value
+              @response[name] = value
             when 'product_code'
-              @instance['productCodes'] << @value
+              @instance['productCodes'] << value
             when 'productCodes'
               @in_product_codes = false
             when 'state'
-              if @value == 'true'
-                @instance['monitoring'][name] = true
-              else
-                @instance['monitoring'][name] = false
-              end
+              @instance['monitoring'][name] = (value == 'true')
             when 'subnetId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/compute/parsers/aws/start_stop_instances.rb b/lib/fog/compute/parsers/aws/start_stop_instances.rb
index f83bd5d97..9c311d09a 100644
--- a/lib/fog/compute/parsers/aws/start_stop_instances.rb
+++ b/lib/fog/compute/parsers/aws/start_stop_instances.rb
@@ -22,14 +22,14 @@ module Fog
           def end_element(name)
             case name
             when 'code'
-              @instance[@state][name] = @value.to_s
+              @instance[@state][name] = value.to_s
             when 'instanceId'
-              @instance[name] = @value
+              @instance[name] = value
             when 'item'
               @response['instancesSet'] << @instance
               @instance = { 'currentState' => {}, 'previousState' => {} }
             when 'name'
-              @instance[@state][name] = @value
+              @instance[@state][name] = value
             end
           end
 
diff --git a/lib/fog/compute/parsers/aws/terminate_instances.rb b/lib/fog/compute/parsers/aws/terminate_instances.rb
index 6f9a466a3..3365188ca 100644
--- a/lib/fog/compute/parsers/aws/terminate_instances.rb
+++ b/lib/fog/compute/parsers/aws/terminate_instances.rb
@@ -22,26 +22,26 @@ module Fog
           def end_element(name)
             case name
             when 'instanceId'
-              @instance[name] = @value
+              @instance[name] = value
             when 'item'
               @response['instancesSet'] << @instance
               @instance = { 'previousState' => {}, 'currentState' => {} }
             when 'code'
               if @in_previous_state
-                @instance['previousState'][name] = @value.to_i
+                @instance['previousState'][name] = value.to_i
               elsif @in_current_state
-                @instance['currentState'][name] = @value.to_i
+                @instance['currentState'][name] = value.to_i
               end
             when 'name'
               if @in_previous_state
-                @instance['previousState'][name] = @value
+                @instance['previousState'][name] = value
               elsif @in_current_state
-                @instance['currentState'][name] = @value
+                @instance['currentState'][name] = value
               end
             when 'previousState'
               @in_previous_state = false
             when 'requestId'
-              @response[name] = @value
+              @response[name] = value
             when 'currentState'
               @in_current_state = false
             end
diff --git a/lib/fog/compute/parsers/slicehost/create_slice.rb b/lib/fog/compute/parsers/slicehost/create_slice.rb
index 99ed7170d..5893c02df 100644
--- a/lib/fog/compute/parsers/slicehost/create_slice.rb
+++ b/lib/fog/compute/parsers/slicehost/create_slice.rb
@@ -13,13 +13,13 @@ module Fog
             case name
             when 'address'
               @response['addresses'] ||= []
-              @response['addresses'] << @value
+              @response['addresses'] << value
             when 'backup-id', 'flavor-id', 'id', 'image-id', 'progress'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'bw-in', 'bw-out'
-              @response[name] = @value.to_f
+              @response[name] = value.to_f
             when 'name', 'root-password', 'status'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/compute/parsers/slicehost/get_backups.rb b/lib/fog/compute/parsers/slicehost/get_backups.rb
index 16a3af007..f10cc341e 100644
--- a/lib/fog/compute/parsers/slicehost/get_backups.rb
+++ b/lib/fog/compute/parsers/slicehost/get_backups.rb
@@ -16,11 +16,11 @@ module Fog
               @response['backups'] << @backup
               @backup = {}
             when 'date'
-              @backup[name] = Time.parse(@value)
+              @backup[name] = Time.parse(value)
             when 'id', 'slice-id'
-              @backup[name] = @value.to_i
+              @backup[name] = value.to_i
             when 'name'
-              @backup[name] = @value
+              @backup[name] = value
             end
           end
 
diff --git a/lib/fog/compute/parsers/slicehost/get_flavor.rb b/lib/fog/compute/parsers/slicehost/get_flavor.rb
index 0d973d281..1c13c1ab7 100644
--- a/lib/fog/compute/parsers/slicehost/get_flavor.rb
+++ b/lib/fog/compute/parsers/slicehost/get_flavor.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'id', 'price', 'ram'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'name'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/compute/parsers/slicehost/get_flavors.rb b/lib/fog/compute/parsers/slicehost/get_flavors.rb
index 255d78bc4..7e750bae7 100644
--- a/lib/fog/compute/parsers/slicehost/get_flavors.rb
+++ b/lib/fog/compute/parsers/slicehost/get_flavors.rb
@@ -16,9 +16,9 @@ module Fog
               @response['flavors'] << @flavor
               @flavor = {}
             when 'id', 'price', 'ram'
-              @flavor[name] = @value.to_i
+              @flavor[name] = value.to_i
             when 'name'
-              @flavor[name] = @value
+              @flavor[name] = value
             end
           end
 
diff --git a/lib/fog/compute/parsers/slicehost/get_image.rb b/lib/fog/compute/parsers/slicehost/get_image.rb
index 6f6218566..1e78f4aee 100644
--- a/lib/fog/compute/parsers/slicehost/get_image.rb
+++ b/lib/fog/compute/parsers/slicehost/get_image.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'id'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'name'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/compute/parsers/slicehost/get_images.rb b/lib/fog/compute/parsers/slicehost/get_images.rb
index b9997fec8..097a46911 100644
--- a/lib/fog/compute/parsers/slicehost/get_images.rb
+++ b/lib/fog/compute/parsers/slicehost/get_images.rb
@@ -13,12 +13,12 @@ module Fog
           def end_element(name)
             case name
             when 'id'
-              @image[name] = @value.to_i
+              @image[name] = value.to_i
             when 'image'
               @response['images'] << @image
               @image = {}
             when 'name'
-              @image[name] = @value
+              @image[name] = value
             end
           end
 
diff --git a/lib/fog/compute/parsers/slicehost/get_slice.rb b/lib/fog/compute/parsers/slicehost/get_slice.rb
index 46e1cdd4c..0a1539afd 100644
--- a/lib/fog/compute/parsers/slicehost/get_slice.rb
+++ b/lib/fog/compute/parsers/slicehost/get_slice.rb
@@ -13,13 +13,13 @@ module Fog
             case name
             when 'address'
               @response['addresses'] ||= []
-              @response['addresses'] << @value
+              @response['addresses'] << value
             when 'backup-id', 'flavor-id', 'id', 'image-id', 'progress'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'bw-in', 'bw-out'
-              @response[name] = @value.to_f
+              @response[name] = value.to_f
             when 'name', 'status'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/compute/parsers/slicehost/get_slices.rb b/lib/fog/compute/parsers/slicehost/get_slices.rb
index 4dfa91993..e80b7278a 100644
--- a/lib/fog/compute/parsers/slicehost/get_slices.rb
+++ b/lib/fog/compute/parsers/slicehost/get_slices.rb
@@ -14,13 +14,13 @@ module Fog
             case name
             when 'address'
               @slice['addresses'] ||= []
-              @slice['addresses'] << @value
+              @slice['addresses'] << value
             when 'backup-id', 'flavor-id', 'id', 'image-id', 'progress'
-              @slice[name] = @value.to_i
+              @slice[name] = value.to_i
             when 'bw-in', 'bw-out'
-              @slice[name] = @value.to_f
+              @slice[name] = value.to_f
             when 'name', 'status'
-              @slice[name] = @value
+              @slice[name] = value
             when 'slice'
               @response['slices'] << @slice
               @slice = {}
diff --git a/lib/fog/compute/parsers/voxel/devices_list.rb b/lib/fog/compute/parsers/voxel/devices_list.rb
index 7af922d0d..5f7a24896 100644
--- a/lib/fog/compute/parsers/voxel/devices_list.rb
+++ b/lib/fog/compute/parsers/voxel/devices_list.rb
@@ -71,13 +71,13 @@ module Fog
             when 'access_method'
               @device['access_methods'] << @access_method
             when 'architecture'
-              @device['operating_system'][name] = @value.to_i
+              @device['operating_system'][name] = value.to_i
             when 'cage', 'facility', 'rack', 'row', 'zone'
-              @device['location'][name]['value'] = @value
+              @device['location'][name]['value'] = value
             when 'cores'
-              @device['processor'][name] = @value.to_i
+              @device['processor'][name] = value.to_i
             when 'description'
-              @device[name] = @value
+              @device[name] = value
             when 'device'
               @response['devices'] << @device
               @device = {}
@@ -85,21 +85,21 @@ module Fog
               @device['drives'] << @drive
               @drive = {}
             when 'cores'
-              @device['processing_cores'] = @value.to_i
+              @device['processing_cores'] = value.to_i
             when 'ipassignment'
-              @device['ipassignments'].last['value'] = @value
+              @device['ipassignments'].last['value'] = value
             when 'model', 'type'
-              @device[name]['value'] = @value
+              @device[name]['value'] = value
             when 'name'
-              @device['operating_system'][name] = @value
+              @device['operating_system'][name] = value
             when 'position'
-              @device['location'][name] = @value
+              @device['location'][name] = value
             when 'power_consumption'
-              @device[name] = [@value, @device[name]].join(' ')
+              @device[name] = [value, @device[name]].join(' ')
             when 'size'
-              @drive[name] = @value.to_i
+              @drive[name] = value.to_i
             when 'host', 'password', 'protocol', 'username'
-              @access_method[name] = @value
+              @access_method[name] = value
             end
           end
 
diff --git a/lib/fog/compute/parsers/voxel/images_list.rb b/lib/fog/compute/parsers/voxel/images_list.rb
index 51b820096..b077ce242 100644
--- a/lib/fog/compute/parsers/voxel/images_list.rb
+++ b/lib/fog/compute/parsers/voxel/images_list.rb
@@ -36,18 +36,18 @@ module Fog
           def end_element(name)
             case name
             when 'architecture'
-              @image['operating_system'][name] = @value.to_i
+              @image['operating_system'][name] = value.to_i
             when 'admin_username', 'family', 'product_family', 'product_version', 'version'
-              @image['operating_system'][name] = @value
+              @image['operating_system'][name] = value
             when 'description'
-              @image[name] = @value
+              @image[name] = value
             when 'image'
               @response['images'] << @image
               @image = {}
             when 'size'
-              @image['filesystem'][name] = @value.to_i
+              @image['filesystem'][name] = value.to_i
             when 'type'
-              @image['filesystem'][name] = @value
+              @image['filesystem'][name] = value
             end
           end
 
diff --git a/lib/fog/compute/parsers/voxel/voxcloud_create.rb b/lib/fog/compute/parsers/voxel/voxcloud_create.rb
index 946452c99..5eb6e2d65 100644
--- a/lib/fog/compute/parsers/voxel/voxcloud_create.rb
+++ b/lib/fog/compute/parsers/voxel/voxcloud_create.rb
@@ -26,9 +26,9 @@ module Fog
           def end_element(name)
             case name
             when 'id'
-              @response['device'][name] = @value
+              @response['device'][name] = value
             when 'last_update'
-              @response['device'][name] = Time.at(@value.to_i)
+              @response['device'][name] = Time.at(value.to_i)
             end
           end
 
diff --git a/lib/fog/compute/parsers/voxel/voxcloud_status.rb b/lib/fog/compute/parsers/voxel/voxcloud_status.rb
index b7cdec9fc..8254a8566 100644
--- a/lib/fog/compute/parsers/voxel/voxcloud_status.rb
+++ b/lib/fog/compute/parsers/voxel/voxcloud_status.rb
@@ -30,9 +30,9 @@ module Fog
               @response['devices'] << @device
               @device = {}
             when 'id', 'status'
-              @device[name] = @value
+              @device[name] = value
             when 'last_update'
-              @device[name] = Time.at(@value.to_i)
+              @device[name] = Time.at(value.to_i)
             end
           end
         end
diff --git a/lib/fog/core/parser.rb b/lib/fog/core/parser.rb
index 88b8bac74..9ef3f0b25 100644
--- a/lib/fog/core/parser.rb
+++ b/lib/fog/core/parser.rb
@@ -10,21 +10,25 @@ module Fog
         reset
       end
 
+      def attr_value(name, attrs)
+        (entry = attrs.detect {|a, v| a == name }) && entry.last
+      end
+
       def reset
         @response = {}
       end
 
       def characters(string)
         @value ||= ''
-        @value << string.gsub(/\n.*/, '')
+        @value << string
       end
 
       def start_element(name, attrs = [])
         @value = nil
       end
 
-      def attr_value(name, attrs)
-        (entry = attrs.detect {|a, v| a == name }) && entry.last
+      def value
+        @value && @value.dup
       end
 
     end
diff --git a/lib/fog/dns/parsers/aws/change_resource_record_sets.rb b/lib/fog/dns/parsers/aws/change_resource_record_sets.rb
index dcb518d40..65636c02f 100644
--- a/lib/fog/dns/parsers/aws/change_resource_record_sets.rb
+++ b/lib/fog/dns/parsers/aws/change_resource_record_sets.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'Id'  
-              @response[name] = @value.sub('/change/', '')
+              @response[name] = value.sub('/change/', '')
             when 'Status', 'SubmittedAt'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/dns/parsers/aws/create_hosted_zone.rb b/lib/fog/dns/parsers/aws/create_hosted_zone.rb
index 862599b45..667c4c039 100644
--- a/lib/fog/dns/parsers/aws/create_hosted_zone.rb
+++ b/lib/fog/dns/parsers/aws/create_hosted_zone.rb
@@ -17,9 +17,9 @@ module Fog
             if @section == :hosted_zone
               case name
               when 'Id'
-                @hosted_zone[name] = @value.sub('/hostedzone/', '')
+                @hosted_zone[name] = value.sub('/hostedzone/', '')
               when 'Name', 'CallerReference', 'Comment'
-                @hosted_zone[name]= @value
+                @hosted_zone[name]= value
               when 'HostedZone'
                 @response['HostedZone'] = @hosted_zone
                 @hosted_zone = {}
@@ -28,9 +28,9 @@ module Fog
             elsif @section == :change_info
               case name
               when 'Id'
-                @change_info[name]= @value.sub('/change/', '')
+                @change_info[name]= value.sub('/change/', '')
               when 'Status', 'SubmittedAt'
-                @change_info[name] = @value
+                @change_info[name] = value
               when 'ChangeInfo'
                 @response['ChangeInfo'] = @change_info
                 @change_info = {}
@@ -39,7 +39,7 @@ module Fog
             elsif @section == :name_servers
               case name
               when 'NameServer'
-                @name_servers << @value
+                @name_servers << value
               when 'NameServers'
                 @response['NameServers'] = @name_servers
                 @name_servers = {}
diff --git a/lib/fog/dns/parsers/aws/delete_hosted_zone.rb b/lib/fog/dns/parsers/aws/delete_hosted_zone.rb
index 733b5e586..d7aae5df9 100644
--- a/lib/fog/dns/parsers/aws/delete_hosted_zone.rb
+++ b/lib/fog/dns/parsers/aws/delete_hosted_zone.rb
@@ -13,7 +13,7 @@ module Fog
           def end_element(name)
             case name
             when 'Id', 'Status', 'SubmittedAt'
-              @response['ChangeInfo'][name] = @value
+              @response['ChangeInfo'][name] = value
             end
           end
 
diff --git a/lib/fog/dns/parsers/aws/get_change.rb b/lib/fog/dns/parsers/aws/get_change.rb
index f88ee12f1..0e0752df1 100644
--- a/lib/fog/dns/parsers/aws/get_change.rb
+++ b/lib/fog/dns/parsers/aws/get_change.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'Id'
-              @response[name] = @value.sub('/change/', '')
+              @response[name] = value.sub('/change/', '')
             when 'Status', 'SubmittedAt'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/dns/parsers/aws/get_hosted_zone.rb b/lib/fog/dns/parsers/aws/get_hosted_zone.rb
index 5eeef851a..3edab4e9e 100644
--- a/lib/fog/dns/parsers/aws/get_hosted_zone.rb
+++ b/lib/fog/dns/parsers/aws/get_hosted_zone.rb
@@ -16,9 +16,9 @@ module Fog
             if @section == :hosted_zone
               case name
               when 'Id'
-                @hosted_zone[name]= @value.sub('/hostedzone/', '')
+                @hosted_zone[name]= value.sub('/hostedzone/', '')
               when 'Name', 'CallerReference', 'Comment'
-                @hosted_zone[name]= @value
+                @hosted_zone[name]= value
               when 'HostedZone'
                 @response['HostedZone'] = @hosted_zone
                 @hosted_zone = {}
@@ -27,7 +27,7 @@ module Fog
             elsif @section == :name_servers
               case name
               when 'NameServer'
-                @name_servers << @value
+                @name_servers << value
               when 'NameServers'
                 @response['NameServers'] = @name_servers
                 @name_servers = {}
diff --git a/lib/fog/dns/parsers/aws/list_hosted_zones.rb b/lib/fog/dns/parsers/aws/list_hosted_zones.rb
index c95a8f095..657fba7ae 100644
--- a/lib/fog/dns/parsers/aws/list_hosted_zones.rb
+++ b/lib/fog/dns/parsers/aws/list_hosted_zones.rb
@@ -14,18 +14,18 @@ module Fog
           def end_element(name)
             case name
             when 'Id'
-              @zone[name] = @value.sub('/hostedzone/', '')
+              @zone[name] = value.sub('/hostedzone/', '')
             when 'Name', 'CallerReference', 'Comment'
-              @zone[name] = @value
+              @zone[name] = value
             when 'HostedZone'
               @hosted_zones << @zone
               @zone = {}
             when 'HostedZones'
               @response['HostedZones'] = @hosted_zones
             when 'MaxItems'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'IsTruncated', 'Marker', 'NextMarker'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/dns/parsers/aws/list_resource_record_sets.rb b/lib/fog/dns/parsers/aws/list_resource_record_sets.rb
index cd9ce7c0f..8535e9394 100644
--- a/lib/fog/dns/parsers/aws/list_resource_record_sets.rb
+++ b/lib/fog/dns/parsers/aws/list_resource_record_sets.rb
@@ -18,9 +18,9 @@ module Fog
             if @section == :resource_record_set
               case name
               when 'Name', 'Type', 'TTL'
-                @resource_record_set[name] = @value
+                @resource_record_set[name] = value
               when 'Value'
-                @resource_record_set['ResourceRecords'] << @value
+                @resource_record_set['ResourceRecords'] << value
               when 'ResourceRecordSet'
                 @response['ResourceRecordSets'] << @resource_record_set
                 @resource_record_set = {}
@@ -31,9 +31,9 @@ module Fog
             elsif @section == :main
                 case name
                 when 'MaxItems'
-                  @response[name]= @value.to_i
+                  @response[name]= value.to_i
                 when 'IsTruncated', 'NextRecordName', 'NextRecordType'
-                  @response[name]= @value
+                  @response[name]= value
                 end
             end
           end
diff --git a/lib/fog/dns/parsers/bluebox/create_record.rb b/lib/fog/dns/parsers/bluebox/create_record.rb
index 2f82ee4f6..c925a356f 100644
--- a/lib/fog/dns/parsers/bluebox/create_record.rb
+++ b/lib/fog/dns/parsers/bluebox/create_record.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'serial', 'ttl', 'retry', 'refresh', 'minimum', 'record-count', 'expires'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'name', 'id'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/dns/parsers/bluebox/create_zone.rb b/lib/fog/dns/parsers/bluebox/create_zone.rb
index 2c83e3e9e..bac49e08e 100644
--- a/lib/fog/dns/parsers/bluebox/create_zone.rb
+++ b/lib/fog/dns/parsers/bluebox/create_zone.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'serial', 'ttl', 'retry', 'refresh', 'minimum', 'record-count', 'expires'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'name', 'id'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/dns/parsers/bluebox/get_record.rb b/lib/fog/dns/parsers/bluebox/get_record.rb
index 0b3a705fc..f8d393412 100644
--- a/lib/fog/dns/parsers/bluebox/get_record.rb
+++ b/lib/fog/dns/parsers/bluebox/get_record.rb
@@ -10,7 +10,7 @@ module Fog
           end
 
           def end_element(name)
-            @response[name] = @value
+            @response[name] = value
           end
 
         end
diff --git a/lib/fog/dns/parsers/bluebox/get_records.rb b/lib/fog/dns/parsers/bluebox/get_records.rb
index 29641cbde..2d3854ce5 100644
--- a/lib/fog/dns/parsers/bluebox/get_records.rb
+++ b/lib/fog/dns/parsers/bluebox/get_records.rb
@@ -16,7 +16,7 @@ module Fog
               @response['records'] << @record
               @record = {}
             else
-              @record[name] = @value
+              @record[name] = value
             end
           end
         end
diff --git a/lib/fog/dns/parsers/bluebox/get_zone.rb b/lib/fog/dns/parsers/bluebox/get_zone.rb
index 6a3fbdbbe..9aa6878b8 100644
--- a/lib/fog/dns/parsers/bluebox/get_zone.rb
+++ b/lib/fog/dns/parsers/bluebox/get_zone.rb
@@ -11,9 +11,9 @@ module Fog
           def end_element(name)
             case name
             when 'serial', 'ttl', 'retry', 'expires', 'record-count', 'refresh', 'minimum'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'name', 'id'
-              @response[name] = @value
+              @response[name] = value
             end
           end
         end
diff --git a/lib/fog/dns/parsers/bluebox/get_zones.rb b/lib/fog/dns/parsers/bluebox/get_zones.rb
index ade93a420..2e5c7c9e6 100644
--- a/lib/fog/dns/parsers/bluebox/get_zones.rb
+++ b/lib/fog/dns/parsers/bluebox/get_zones.rb
@@ -13,9 +13,9 @@ module Fog
           def end_element(name)
             case name
             when 'serial', 'ttl', 'retry', 'expires', 'record-count', 'refresh', 'minimum'
-              @zone[name] = @value.to_i
+              @zone[name] = value.to_i
             when 'name', 'id'
-              @zone[name] = @value
+              @zone[name] = value
             when 'record'
               @response['zones'] << @zone
               @zone = {}
diff --git a/lib/fog/dns/parsers/slicehost/create_record.rb b/lib/fog/dns/parsers/slicehost/create_record.rb
index b1d74ed82..2e7b1a27f 100644
--- a/lib/fog/dns/parsers/slicehost/create_record.rb
+++ b/lib/fog/dns/parsers/slicehost/create_record.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'zone-id', 'ttl', 'id'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'record-type', 'name', 'data', 'active', 'aux'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/dns/parsers/slicehost/create_zone.rb b/lib/fog/dns/parsers/slicehost/create_zone.rb
index e4c63816c..a296e99c1 100644
--- a/lib/fog/dns/parsers/slicehost/create_zone.rb
+++ b/lib/fog/dns/parsers/slicehost/create_zone.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'ttl', 'id'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'origin', 'active'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/dns/parsers/slicehost/get_record.rb b/lib/fog/dns/parsers/slicehost/get_record.rb
index 9dbbf9040..a51fb2d35 100644
--- a/lib/fog/dns/parsers/slicehost/get_record.rb
+++ b/lib/fog/dns/parsers/slicehost/get_record.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'zone-id', 'ttl'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'record-type', 'name', 'data', 'active', 'aux'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/dns/parsers/slicehost/get_records.rb b/lib/fog/dns/parsers/slicehost/get_records.rb
index 594ae3323..049eba910 100644
--- a/lib/fog/dns/parsers/slicehost/get_records.rb
+++ b/lib/fog/dns/parsers/slicehost/get_records.rb
@@ -13,9 +13,9 @@ module Fog
           def end_element(name)
             case name
             when 'zone-id', 'ttl'
-              @record[name] = @value.to_i
+              @record[name] = value.to_i
             when 'record-type', 'name', 'data', 'active', 'aux'
-              @record[name] = @value
+              @record[name] = value
             when 'record'
               @response['records'] << @record
               @record = {}
diff --git a/lib/fog/dns/parsers/slicehost/get_zone.rb b/lib/fog/dns/parsers/slicehost/get_zone.rb
index 1064e7c25..d0af4146b 100644
--- a/lib/fog/dns/parsers/slicehost/get_zone.rb
+++ b/lib/fog/dns/parsers/slicehost/get_zone.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'ttl', 'id'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'origin', 'active'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/dns/parsers/slicehost/get_zones.rb b/lib/fog/dns/parsers/slicehost/get_zones.rb
index 97bd29086..8ae35ef79 100644
--- a/lib/fog/dns/parsers/slicehost/get_zones.rb
+++ b/lib/fog/dns/parsers/slicehost/get_zones.rb
@@ -13,9 +13,9 @@ module Fog
           def end_element(name)
             case name
             when 'ttl', 'id'
-              @zone[name] = @value.to_i
+              @zone[name] = value.to_i
             when 'active', 'origin'
-              @zone[name] = @value
+              @zone[name] = value
             when 'zone'
               @response['zones'] << @zone
               @zone = {}
diff --git a/lib/fog/dns/parsers/zerigo/count_hosts.rb b/lib/fog/dns/parsers/zerigo/count_hosts.rb
index 1baa30fff..479669f96 100644
--- a/lib/fog/dns/parsers/zerigo/count_hosts.rb
+++ b/lib/fog/dns/parsers/zerigo/count_hosts.rb
@@ -12,7 +12,7 @@ module Fog
           def end_element(name)
             case name
             when 'count'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             end
           end
 
diff --git a/lib/fog/dns/parsers/zerigo/count_zones.rb b/lib/fog/dns/parsers/zerigo/count_zones.rb
index 4a5f9b5ee..931b9793e 100644
--- a/lib/fog/dns/parsers/zerigo/count_zones.rb
+++ b/lib/fog/dns/parsers/zerigo/count_zones.rb
@@ -12,7 +12,7 @@ module Fog
           def end_element(name)
             case name
             when 'count'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             end
           end
 
diff --git a/lib/fog/dns/parsers/zerigo/create_host.rb b/lib/fog/dns/parsers/zerigo/create_host.rb
index c20f25394..de63b13f8 100644
--- a/lib/fog/dns/parsers/zerigo/create_host.rb
+++ b/lib/fog/dns/parsers/zerigo/create_host.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'id', 'priority', 'ttl', 'zone-id'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'data', 'fqdn', 'host-type', 'hostname', 'notes', 'zone-id', 'created-at', 'updated-at'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/dns/parsers/zerigo/create_zone.rb b/lib/fog/dns/parsers/zerigo/create_zone.rb
index 964472755..c03f254d5 100644
--- a/lib/fog/dns/parsers/zerigo/create_zone.rb
+++ b/lib/fog/dns/parsers/zerigo/create_zone.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'default-ttl', 'id', 'nx-ttl', 'hosts-count'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'created-at', 'custom-nameservers', 'custom-ns', 'domain', 'hostmaster', 'notes', 'ns1', 'ns-type', 'slave-nameservers', 'tag-list', 'updated-at', 'hosts', 'axfr-ips', 'restrict-axfr'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/dns/parsers/zerigo/find_hosts.rb b/lib/fog/dns/parsers/zerigo/find_hosts.rb
index c8b468cd2..0bb9686af 100644
--- a/lib/fog/dns/parsers/zerigo/find_hosts.rb
+++ b/lib/fog/dns/parsers/zerigo/find_hosts.rb
@@ -13,9 +13,9 @@ module Fog
           def end_element(name)
             case name
             when 'id', 'priority', 'ttl', 'zone-id'
-              @host[name] = @value.to_i
+              @host[name] = value.to_i
             when 'data', 'fqdn', 'host-type', 'hostname', 'notes', 'zone-id', 'created-at', 'updated-at'
-              @host[name] = @value
+              @host[name] = value
             when 'host'
               @response['hosts'] << @host
               @host = {}
diff --git a/lib/fog/dns/parsers/zerigo/get_host.rb b/lib/fog/dns/parsers/zerigo/get_host.rb
index 7fc9673bd..bdc510ae1 100644
--- a/lib/fog/dns/parsers/zerigo/get_host.rb
+++ b/lib/fog/dns/parsers/zerigo/get_host.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'id', 'priority', 'ttl', 'zone-id'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'data', 'fqdn', 'host-type', 'hostname', 'notes', 'zone-id', 'created-at', 'updated-at'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/dns/parsers/zerigo/get_zone.rb b/lib/fog/dns/parsers/zerigo/get_zone.rb
index 4bf9f2cc6..a1b77d4fc 100644
--- a/lib/fog/dns/parsers/zerigo/get_zone.rb
+++ b/lib/fog/dns/parsers/zerigo/get_zone.rb
@@ -26,9 +26,9 @@ module Fog
               #in hosts part of response
               case name
               when 'id', 'priority', 'ttl', 'zone-id'
-                @host[name] = @value.to_i
+                @host[name] = value.to_i
               when 'data', 'fqdn', 'host-type', 'hostname', 'notes', 'zone-id', 'created-at', 'updated-at'
-                @host[name] = @value
+                @host[name] = value
               when 'host'
                 @hosts << @host
                 @host = {}
@@ -40,9 +40,9 @@ module Fog
               #in zone part of data
               case name
               when 'default-ttl', 'id', 'nx-ttl', 'hosts-count'
-                @response[name] = @value.to_i
+                @response[name] = value.to_i
               when 'created-at', 'custom-nameservers', 'custom-ns', 'domain', 'hostmaster', 'notes', 'ns1', 'ns-type', 'slave-nameservers', 'tag-list', 'updated-at', 'hosts', 'axfr-ips', 'restrict-axfr'
-                @response[name] = @value
+                @response[name] = value
               end
             end
             
diff --git a/lib/fog/dns/parsers/zerigo/get_zone_stats.rb b/lib/fog/dns/parsers/zerigo/get_zone_stats.rb
index db19b78c7..30649ce76 100644
--- a/lib/fog/dns/parsers/zerigo/get_zone_stats.rb
+++ b/lib/fog/dns/parsers/zerigo/get_zone_stats.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'id', 'queries'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'domain', 'period-begin', 'period-end'
-              @response[name] = @value
+              @response[name] = value
             end            
           end
 
diff --git a/lib/fog/dns/parsers/zerigo/list_hosts.rb b/lib/fog/dns/parsers/zerigo/list_hosts.rb
index 6e3ffed9c..a4513eb06 100644
--- a/lib/fog/dns/parsers/zerigo/list_hosts.rb
+++ b/lib/fog/dns/parsers/zerigo/list_hosts.rb
@@ -13,9 +13,9 @@ module Fog
           def end_element(name)
             case name
             when 'id', 'priority', 'ttl', 'zone-id'
-              @host[name] = @value.to_i
+              @host[name] = value.to_i
             when 'data', 'fqdn', 'host-type', 'hostname', 'notes', 'zone-id', 'created-at', 'updated-at'
-              @host[name] = @value
+              @host[name] = value
             when 'host'
               @response['hosts'] << @host
               @host = {}
diff --git a/lib/fog/dns/parsers/zerigo/list_zones.rb b/lib/fog/dns/parsers/zerigo/list_zones.rb
index 18716d633..3c16d5abe 100644
--- a/lib/fog/dns/parsers/zerigo/list_zones.rb
+++ b/lib/fog/dns/parsers/zerigo/list_zones.rb
@@ -13,9 +13,9 @@ module Fog
           def end_element(name)
             case name
             when 'default-ttl', 'id', 'nx-ttl', 'hosts-count'
-              @zone[name] = @value.to_i
+              @zone[name] = value.to_i
             when 'created-at', 'custom-nameservers', 'custom-ns', 'domain', 'hostmaster', 'notes', 'ns1', 'ns-type', 'slave-nameservers', 'tag-list', 'updated-at', 'hosts', 'axfr-ips', 'restrict-axfr'
-              @zone[name] = @value
+              @zone[name] = value
             when 'zone'
               @response['zones'] << @zone
               @zone = {}
diff --git a/lib/fog/storage/parsers/aws/access_control_list.rb b/lib/fog/storage/parsers/aws/access_control_list.rb
index b0f1f70db..0ff3d7674 100644
--- a/lib/fog/storage/parsers/aws/access_control_list.rb
+++ b/lib/fog/storage/parsers/aws/access_control_list.rb
@@ -27,14 +27,14 @@ module Fog
               @grant = { 'Grantee' => {} }
             when 'DisplayName', 'ID'
               if @in_access_control_list
-                @grant['Grantee'][name] = @value
+                @grant['Grantee'][name] = value
               else
-                @response['Owner'][name] = @value
+                @response['Owner'][name] = value
               end
             when 'Permission'
-              @grant[name] = @value
+              @grant[name] = value
             when 'URI'
-              @grant['Grantee'][name] = @value
+              @grant['Grantee'][name] = value
             end
           end
 
diff --git a/lib/fog/storage/parsers/aws/complete_multipart_upload.rb b/lib/fog/storage/parsers/aws/complete_multipart_upload.rb
index 272cce601..33eca4739 100644
--- a/lib/fog/storage/parsers/aws/complete_multipart_upload.rb
+++ b/lib/fog/storage/parsers/aws/complete_multipart_upload.rb
@@ -12,7 +12,7 @@ module Fog
           def end_element(name)
             case name
             when 'Bucket', 'ETag', 'Key', 'Location'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/storage/parsers/aws/copy_object.rb b/lib/fog/storage/parsers/aws/copy_object.rb
index 4e428bd06..6e6930dc6 100644
--- a/lib/fog/storage/parsers/aws/copy_object.rb
+++ b/lib/fog/storage/parsers/aws/copy_object.rb
@@ -8,9 +8,9 @@ module Fog
           def end_element(name)
             case name
             when 'ETag'
-              @response[name] = @value.gsub('"', '')
+              @response[name] = value.gsub('"', '')
             when 'LastModified'
-              @response[name] = Time.parse(@value)
+              @response[name] = Time.parse(value)
             end
           end
 
diff --git a/lib/fog/storage/parsers/aws/get_bucket.rb b/lib/fog/storage/parsers/aws/get_bucket.rb
index 0f69b7f38..3f0515331 100644
--- a/lib/fog/storage/parsers/aws/get_bucket.rb
+++ b/lib/fog/storage/parsers/aws/get_bucket.rb
@@ -26,31 +26,31 @@ module Fog
               @response['Contents'] << @object
               @object = { 'Owner' => {} }
             when 'DisplayName', 'ID'
-              @object['Owner'][name] = @value
+              @object['Owner'][name] = value
             when 'ETag'
-              @object[name] = @value.gsub('"', '')
+              @object[name] = value.gsub('"', '')
             when 'IsTruncated'
-              if @value == 'true'
+              if value == 'true'
                 @response['IsTruncated'] = true
               else
                 @response['IsTruncated'] = false
               end
             when 'LastModified'
-              @object['LastModified'] = Time.parse(@value)
+              @object['LastModified'] = Time.parse(value)
             when 'Marker', 'Name'
-              @response[name] = @value
+              @response[name] = value
             when 'MaxKeys'
-              @response['MaxKeys'] = @value.to_i
+              @response['MaxKeys'] = value.to_i
             when 'Prefix'
               if @in_common_prefixes
-                @response['CommonPrefixes'] << @value
+                @response['CommonPrefixes'] << value
               else
-                @response[name] = @value
+                @response[name] = value
               end
             when 'Size'
-              @object['Size'] = @value.to_i
+              @object['Size'] = value.to_i
             when 'Delimiter', 'Key', 'StorageClass'
-              @object[name] = @value
+              @object[name] = value
             end
           end
 
diff --git a/lib/fog/storage/parsers/aws/get_bucket_location.rb b/lib/fog/storage/parsers/aws/get_bucket_location.rb
index ba40bd006..d1bba6c27 100644
--- a/lib/fog/storage/parsers/aws/get_bucket_location.rb
+++ b/lib/fog/storage/parsers/aws/get_bucket_location.rb
@@ -8,7 +8,7 @@ module Fog
           def end_element(name)
             case name
             when 'LocationConstraint'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/storage/parsers/aws/get_bucket_logging.rb b/lib/fog/storage/parsers/aws/get_bucket_logging.rb
index fabbf8500..322b110c9 100644
--- a/lib/fog/storage/parsers/aws/get_bucket_logging.rb
+++ b/lib/fog/storage/parsers/aws/get_bucket_logging.rb
@@ -14,9 +14,9 @@ module Fog
             case name
             when 'DisplayName', 'ID'
               if @in_access_control_list
-                @grant['Grantee'][name] = @value
+                @grant['Grantee'][name] = value
               else
-                @response['Owner'][name] = @value
+                @response['Owner'][name] = value
               end
             when 'Grant'
               @response['BucketLoggingStatus']['LoggingEnabled']['TargetGrants'] << @grant
@@ -24,11 +24,11 @@ module Fog
             when 'LoggingEnabled'
               @response['BucketLoggingStatus']['LoggingEnabled'] = { 'TargetGrants' => [] }
             when 'Permission'
-              @grant[name] = @value
+              @grant[name] = value
             when 'TargetBucket', 'TargetPrefix'
-              @response['BucketLoggingStatus'][name] = @value
+              @response['BucketLoggingStatus'][name] = value
             when 'URI'
-              @grant['Grantee'][name] = @value
+              @grant['Grantee'][name] = value
             end
           end
 
diff --git a/lib/fog/storage/parsers/aws/get_bucket_object_versions.rb b/lib/fog/storage/parsers/aws/get_bucket_object_versions.rb
index 70e6cc304..2618e9f3a 100644
--- a/lib/fog/storage/parsers/aws/get_bucket_object_versions.rb
+++ b/lib/fog/storage/parsers/aws/get_bucket_object_versions.rb
@@ -40,21 +40,21 @@ module Fog
                 @delete_marker
               elsif @in_version
                 @version
-              end['Owner'][name] = @value
+              end['Owner'][name] = value
             when 'ETag'
-              @version[name] = @value.gsub('"', '')
+              @version[name] = value.gsub('"', '')
             when 'IsLatest'
               if @in_delete_marker
                 @delete_marker
               elsif @in_version
                 @version
-              end['IsLatest'] = if @value == 'true'
+              end['IsLatest'] = if value == 'true'
                 true
               else
                 false
               end
             when 'IsTruncated'
-              if @value == 'true'
+              if value == 'true'
                 @response['IsTruncated'] = true
               else
                 @response['IsTruncated'] = false
@@ -64,11 +64,11 @@ module Fog
                 @delete_marker
               elsif @in_version
                 @version
-              end['LastModified'] = Time.parse(@value)
+              end['LastModified'] = Time.parse(value)
             when 'MaxKeys'
-              @response['MaxKeys'] = @value.to_i
+              @response['MaxKeys'] = value.to_i
             when 'Size'
-              @version['Size'] = @value.to_i
+              @version['Size'] = value.to_i
             when 'Key', 'KeyMarker', 'Name', 'Prefix', 'StorageClass', 'VersionId', 'VersionIdMarker'
               if @in_delete_marker
                 @delete_marker
@@ -76,7 +76,7 @@ module Fog
                 @version
               else
                 @response
-              end[name] = @value
+              end[name] = value
             end
           end
 
diff --git a/lib/fog/storage/parsers/aws/get_bucket_versioning.rb b/lib/fog/storage/parsers/aws/get_bucket_versioning.rb
index 1a3f9470a..ebf2e7533 100644
--- a/lib/fog/storage/parsers/aws/get_bucket_versioning.rb
+++ b/lib/fog/storage/parsers/aws/get_bucket_versioning.rb
@@ -12,7 +12,7 @@ module Fog
           def end_element(name)
             case name
             when 'Status'
-              @response['VersioningConfiguration'][name] = @value
+              @response['VersioningConfiguration'][name] = value
             end
           end
 
diff --git a/lib/fog/storage/parsers/aws/get_bucket_website.rb b/lib/fog/storage/parsers/aws/get_bucket_website.rb
index 3fa30c514..7998a84d5 100644
--- a/lib/fog/storage/parsers/aws/get_bucket_website.rb
+++ b/lib/fog/storage/parsers/aws/get_bucket_website.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'Key'
-              @response['ErrorDocument'][name] = @value
+              @response['ErrorDocument'][name] = value
             when 'Suffix'
-              @response['IndexDocument'][name] = @value
+              @response['IndexDocument'][name] = value
             end
           end
 
diff --git a/lib/fog/storage/parsers/aws/get_request_payment.rb b/lib/fog/storage/parsers/aws/get_request_payment.rb
index 2884f4b67..a8cad9ea8 100644
--- a/lib/fog/storage/parsers/aws/get_request_payment.rb
+++ b/lib/fog/storage/parsers/aws/get_request_payment.rb
@@ -8,7 +8,7 @@ module Fog
           def end_element(name)
             case name
             when 'Payer'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/storage/parsers/aws/get_service.rb b/lib/fog/storage/parsers/aws/get_service.rb
index d3ad8cc02..f1c76260f 100644
--- a/lib/fog/storage/parsers/aws/get_service.rb
+++ b/lib/fog/storage/parsers/aws/get_service.rb
@@ -16,11 +16,11 @@ module Fog
               @response['Buckets'] << @bucket
               @bucket = {}
             when 'CreationDate'
-              @bucket['CreationDate'] = Time.parse(@value)
+              @bucket['CreationDate'] = Time.parse(value)
             when 'DisplayName', 'ID'
-              @response['Owner'][name] = @value
+              @response['Owner'][name] = value
             when 'Name'
-              @bucket[name] = @value
+              @bucket[name] = value
             end
           end
 
diff --git a/lib/fog/storage/parsers/aws/initiate_multipart_upload.rb b/lib/fog/storage/parsers/aws/initiate_multipart_upload.rb
index 2037d42cc..05d16892e 100644
--- a/lib/fog/storage/parsers/aws/initiate_multipart_upload.rb
+++ b/lib/fog/storage/parsers/aws/initiate_multipart_upload.rb
@@ -12,7 +12,7 @@ module Fog
           def end_element(name)
             case name
             when 'Bucket', 'Key', 'UploadId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/storage/parsers/aws/list_multipart_uploads.rb b/lib/fog/storage/parsers/aws/list_multipart_uploads.rb
index 26f3cc920..17ca6fec3 100644
--- a/lib/fog/storage/parsers/aws/list_multipart_uploads.rb
+++ b/lib/fog/storage/parsers/aws/list_multipart_uploads.rb
@@ -23,23 +23,23 @@ module Fog
           def end_element(name)
             case name
             when 'Bucket', 'KeyMarker', 'NextKeyMarker', 'NextUploadIdMarker', 'UploadIdMarker'
-              @response[name] = @value
+              @response[name] = value
             when 'DisplayName', 'ID'
               if @in_initiator
-                @upload['Initiator'][name] = @value
+                @upload['Initiator'][name] = value
               elsif @in_owner
-                @upload['Owner'][name] = @value
+                @upload['Owner'][name] = value
               end
             when 'Initiated'
-              @upload[name] = Time.parse(@value)
+              @upload[name] = Time.parse(value)
             when 'Initiator'
               @in_initiator = false
             when 'IsTruncated'
-              @response[name] = @value == 'true'
+              @response[name] = value == 'true'
             when 'Key', 'StorageClass', 'UploadId'
-              @upload[name] = @value
+              @upload[name] = value
             when 'MaxUploads'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'Owner'
               @in_owner = false
             when 'Upload'
diff --git a/lib/fog/storage/parsers/aws/list_parts.rb b/lib/fog/storage/parsers/aws/list_parts.rb
index 41e669362..11055a756 100644
--- a/lib/fog/storage/parsers/aws/list_parts.rb
+++ b/lib/fog/storage/parsers/aws/list_parts.rb
@@ -13,22 +13,22 @@ module Fog
           def end_element(name)
             case name
             when 'Bucket', 'Key', 'NextPartNumberMarker', 'PartNumberMarker', 'StorageClass', 'UploadId'
-              @response[name] = @value
+              @response[name] = value
             when 'DisplayName', 'ID'
-              @response['Initiator'][name] = @value
+              @response['Initiator'][name] = value
             when 'ETag'
-              @part[name] = @value
+              @part[name] = value
             when 'IsTruncated'
-              @response[name] = @value == 'true'
+              @response[name] = value == 'true'
             when 'LastModified'
-              @part[name] = Time.parse(@value)
+              @part[name] = Time.parse(value)
             when 'MaxParts'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'Part'
               @response['Part'] << @part
               @part = {}
             when 'PartNumber', 'Size'
-              @part[name] = @value.to_i
+              @part[name] = value.to_i
             end
           end
 
diff --git a/lib/fog/storage/parsers/google/access_control_list.rb b/lib/fog/storage/parsers/google/access_control_list.rb
index 06e603eb4..61e2539ba 100644
--- a/lib/fog/storage/parsers/google/access_control_list.rb
+++ b/lib/fog/storage/parsers/google/access_control_list.rb
@@ -31,12 +31,12 @@ module Fog
               @entry = { 'Scope' => {} }
             when 'DisplayName', 'ID'
               if @in_entries
-                @entry['Scope'][name] = @value
+                @entry['Scope'][name] = value
               else
-                @response['Owner'][name] = @value
+                @response['Owner'][name] = value
               end
             when 'Permission'
-              @entry[name] = @value
+              @entry[name] = value
             end
           end
 
diff --git a/lib/fog/storage/parsers/google/copy_object.rb b/lib/fog/storage/parsers/google/copy_object.rb
index 843ef79ef..cbc9ca4be 100644
--- a/lib/fog/storage/parsers/google/copy_object.rb
+++ b/lib/fog/storage/parsers/google/copy_object.rb
@@ -8,9 +8,9 @@ module Fog
           def end_element(name)
             case name
             when 'ETag'
-              @response[name] = @value.gsub('"', '')
+              @response[name] = value.gsub('"', '')
             when 'LastModified'
-              @response[name] = Time.parse(@value)
+              @response[name] = Time.parse(value)
             end
           end
 
diff --git a/lib/fog/storage/parsers/google/get_bucket.rb b/lib/fog/storage/parsers/google/get_bucket.rb
index d70d9103c..ed05cca17 100644
--- a/lib/fog/storage/parsers/google/get_bucket.rb
+++ b/lib/fog/storage/parsers/google/get_bucket.rb
@@ -26,31 +26,31 @@ module Fog
               @response['Contents'] << @object
               @object = { 'Owner' => {} }
             when 'DisplayName', 'ID'
-              @object['Owner'][name] = @value
+              @object['Owner'][name] = value
             when 'ETag'
-              @object[name] = @value.gsub('"', '')
+              @object[name] = value.gsub('"', '')
             when 'IsTruncated'
-              if @value == 'true'
+              if value == 'true'
                 @response['IsTruncated'] = true
               else
                 @response['IsTruncated'] = false
               end
             when 'LastModified'
-              @object['LastModified'] = Time.parse(@value)
+              @object['LastModified'] = Time.parse(value)
             when 'Marker', 'Name'
-              @response[name] = @value
+              @response[name] = value
             when 'MaxKeys'
-              @response['MaxKeys'] = @value.to_i
+              @response['MaxKeys'] = value.to_i
             when 'Prefix'
               if @in_common_prefixes
-                @response['CommonPrefixes'] << @value
+                @response['CommonPrefixes'] << value
               else
-                @response[name] = @value
+                @response[name] = value
               end
             when 'Size'
-              @object['Size'] = @value.to_i
+              @object['Size'] = value.to_i
             when 'Delimiter', 'Key', 'StorageClass'
-              @object[name] = @value
+              @object[name] = value
             end
           end
 
diff --git a/lib/fog/storage/parsers/google/get_bucket_logging.rb b/lib/fog/storage/parsers/google/get_bucket_logging.rb
index 9d4672ad8..be85482a3 100644
--- a/lib/fog/storage/parsers/google/get_bucket_logging.rb
+++ b/lib/fog/storage/parsers/google/get_bucket_logging.rb
@@ -14,9 +14,9 @@ module Fog
             case name
             when 'DisplayName', 'ID'
               if @in_access_control_list
-                @grant['Grantee'][name] = @value
+                @grant['Grantee'][name] = value
               else
-                @response['Owner'][name] = @value
+                @response['Owner'][name] = value
               end
             when 'Grant'
               @response['BucketLoggingStatus']['LoggingEnabled']['TargetGrants'] << @grant
@@ -24,11 +24,11 @@ module Fog
             when 'LoggingEnabled'
               @response['BucketLoggingStatus']['LoggingEnabled'] = { 'TargetGrants' => [] }
             when 'Permission'
-              @grant[name] = @value
+              @grant[name] = value
             when 'TargetBucket', 'TargetPrefix'
-              @response['BucketLoggingStatus'][name] = @value
+              @response['BucketLoggingStatus'][name] = value
             when 'URI'
-              @grant['Grantee'][name] = @value
+              @grant['Grantee'][name] = value
             end
           end
 
diff --git a/lib/fog/storage/parsers/google/get_bucket_object_versions.rb b/lib/fog/storage/parsers/google/get_bucket_object_versions.rb
index 4d522eb0a..b96439ed0 100644
--- a/lib/fog/storage/parsers/google/get_bucket_object_versions.rb
+++ b/lib/fog/storage/parsers/google/get_bucket_object_versions.rb
@@ -40,21 +40,21 @@ module Fog
                 @delete_marker
               elsif @in_version
                 @version
-              end['Owner'][name] = @value
+              end['Owner'][name] = value
             when 'ETag'
-              @version[name] = @value.gsub('"', '')
+              @version[name] = value.gsub('"', '')
             when 'IsLatest'
               if @in_delete_marker
                 @delete_marker
               elsif @in_version
                 @version
-              end['IsLatest'] = if @value == 'true'
+              end['IsLatest'] = if value == 'true'
                 true
               else
                 false
               end
             when 'IsTruncated'
-              if @value == 'true'
+              if value == 'true'
                 @response['IsTruncated'] = true
               else
                 @response['IsTruncated'] = false
@@ -64,19 +64,19 @@ module Fog
                 @delete_marker
               elsif @in_version
                 @version
-              end['LastModified'] = Time.parse(@value)
+              end['LastModified'] = Time.parse(value)
             when 'KeyMarker', 'Name', 'Prefix', 'VersionIdMarker'
-              @response[name] = @value
+              @response[name] = value
             when 'MaxKeys'
-              @response['MaxKeys'] = @value.to_i
+              @response['MaxKeys'] = value.to_i
             when 'Size'
-              @version['Size'] = @value.to_i
+              @version['Size'] = value.to_i
             when 'Key', 'Name', 'StorageClass', 'VersionId'
               if @in_delete_marker
                 @delete_marker
               elsif @in_version
                 @version
-              end[name] = @value
+              end[name] = value
             end
           end
 
diff --git a/lib/fog/storage/parsers/google/get_bucket_versioning.rb b/lib/fog/storage/parsers/google/get_bucket_versioning.rb
index 607bfbffa..48cfb9676 100644
--- a/lib/fog/storage/parsers/google/get_bucket_versioning.rb
+++ b/lib/fog/storage/parsers/google/get_bucket_versioning.rb
@@ -12,7 +12,7 @@ module Fog
           def end_element(name)
             case name
             when 'Status'
-              @response['VersioningConfiguration'][name] = @value
+              @response['VersioningConfiguration'][name] = value
             end
           end
 
diff --git a/lib/fog/storage/parsers/google/get_request_payment.rb b/lib/fog/storage/parsers/google/get_request_payment.rb
index c63311402..058ee8cf4 100644
--- a/lib/fog/storage/parsers/google/get_request_payment.rb
+++ b/lib/fog/storage/parsers/google/get_request_payment.rb
@@ -8,7 +8,7 @@ module Fog
           def end_element(name)
             case name
             when 'Payer'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/storage/parsers/google/get_service.rb b/lib/fog/storage/parsers/google/get_service.rb
index 29a4e6dde..4b8a8b0cc 100644
--- a/lib/fog/storage/parsers/google/get_service.rb
+++ b/lib/fog/storage/parsers/google/get_service.rb
@@ -16,11 +16,11 @@ module Fog
               @response['Buckets'] << @bucket
               @bucket = {}
             when 'CreationDate'
-              @bucket['CreationDate'] = Time.parse(@value)
+              @bucket['CreationDate'] = Time.parse(value)
             when 'DisplayName', 'ID'
-              @response['Owner'][name] = @value
+              @response['Owner'][name] = value
             when 'Name'
-              @bucket[name] = @value
+              @bucket[name] = value
             end
           end
 
diff --git a/lib/fog/terremark/parsers/shared/get_catalog.rb b/lib/fog/terremark/parsers/shared/get_catalog.rb
index f426c3180..6a0780d2f 100644
--- a/lib/fog/terremark/parsers/shared/get_catalog.rb
+++ b/lib/fog/terremark/parsers/shared/get_catalog.rb
@@ -34,7 +34,7 @@ module Fog
 
           def end_element(name)
             if name == 'Description'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/terremark/parsers/shared/get_catalog_item.rb b/lib/fog/terremark/parsers/shared/get_catalog_item.rb
index b6effc249..d0249a8cc 100644
--- a/lib/fog/terremark/parsers/shared/get_catalog_item.rb
+++ b/lib/fog/terremark/parsers/shared/get_catalog_item.rb
@@ -34,7 +34,7 @@ module Fog
 
           def end_element(name)
             if name == 'Property'
-              @response['Properties'][@property_key] = @value
+              @response['Properties'][@property_key] = value
             end
           end
 
diff --git a/lib/fog/terremark/parsers/shared/get_internet_services.rb b/lib/fog/terremark/parsers/shared/get_internet_services.rb
index 1aaf0493b..450ab5f05 100644
--- a/lib/fog/terremark/parsers/shared/get_internet_services.rb
+++ b/lib/fog/terremark/parsers/shared/get_internet_services.rb
@@ -22,9 +22,9 @@ module Fog
           def end_element(name)
             case name
             when 'Description', 'Protocol'
-              @internet_service[name] = @value
+              @internet_service[name] = value
             when 'Enabled'
-              if @value == 'true'
+              if value == 'true'
                 @internet_service[name] = true
               else
                 @internet_service[name] = false
@@ -32,22 +32,22 @@ module Fog
             when 'Href', 'Name'
               if @in_public_ip_address
                 @internet_service['PublicIpAddress'] ||= {}
-                @internet_service['PublicIpAddress'][name] = @value
+                @internet_service['PublicIpAddress'][name] = value
               else
-                @internet_service[name] = @value
+                @internet_service[name] = value
               end
             when 'Id'
               if @in_public_ip_address
                 @internet_service['PublicIpAddress'] ||= {}
-                @internet_service['PublicIpAddress'][name] = @value.to_i
+                @internet_service['PublicIpAddress'][name] = value.to_i
               else
-                @internet_service[name] = @value.to_i
+                @internet_service[name] = value.to_i
               end
             when 'InternetService'
               @response['InternetServices'] << @internet_service
               @internet_service = {}
             when 'Port', 'Timeout'
-              @internet_service[name] = @value.to_i
+              @internet_service[name] = value.to_i
             when 'PublicIpAddress'
               @in_public_ip_address = false
             end
diff --git a/lib/fog/terremark/parsers/shared/get_network_ips.rb b/lib/fog/terremark/parsers/shared/get_network_ips.rb
index 12e5970bf..bc7de10ce 100644
--- a/lib/fog/terremark/parsers/shared/get_network_ips.rb
+++ b/lib/fog/terremark/parsers/shared/get_network_ips.rb
@@ -13,7 +13,7 @@ module Fog
           def end_element(name)
             case name
             when 'Name', 'Status', 'Server'
-              @ip_address[name.downcase] = @value
+              @ip_address[name.downcase] = value
             when 'IpAddress'
               @response['IpAddresses'] << @ip_address
               @ip_address = {}
diff --git a/lib/fog/terremark/parsers/shared/get_node_services.rb b/lib/fog/terremark/parsers/shared/get_node_services.rb
index 8acae6643..e0f83e013 100644
--- a/lib/fog/terremark/parsers/shared/get_node_services.rb
+++ b/lib/fog/terremark/parsers/shared/get_node_services.rb
@@ -13,15 +13,15 @@ module Fog
           def end_element(name)
             case name
             when 'Description', 'Href', 'Name', 'IpAddress'
-              @node_service[name] = @value
+              @node_service[name] = value
             when 'Enabled'
-              if @value == 'true'
+              if value == 'true'
                 @node_service[name] = true
               else
                 @node_service[name] = false
               end
             when 'Id', 'Port'
-              @node_service[name] = @value.to_i
+              @node_service[name] = value.to_i
             when 'NodeService'
               @response['NodeServices'] << @node_service
               @node_service = {}
diff --git a/lib/fog/terremark/parsers/shared/get_organization.rb b/lib/fog/terremark/parsers/shared/get_organization.rb
index 1f3d86558..4d1516902 100644
--- a/lib/fog/terremark/parsers/shared/get_organization.rb
+++ b/lib/fog/terremark/parsers/shared/get_organization.rb
@@ -40,7 +40,7 @@ module Fog
 
           def end_element(name)
             if name == 'Description'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/terremark/parsers/shared/get_public_ips.rb b/lib/fog/terremark/parsers/shared/get_public_ips.rb
index 98d9d2e06..2a7b55de8 100644
--- a/lib/fog/terremark/parsers/shared/get_public_ips.rb
+++ b/lib/fog/terremark/parsers/shared/get_public_ips.rb
@@ -13,9 +13,9 @@ module Fog
           def end_element(name)
             case name
             when 'Href', 'Name'
-              @ip_address[name.downcase] = @value
+              @ip_address[name.downcase] = value
             when 'Id'
-              @ip_address['id'] = @value.to_i
+              @ip_address['id'] = value.to_i
             when 'PublicIPAddress'
               @response['PublicIpAddresses'] << @ip_address
               @ip_address = {}
diff --git a/lib/fog/terremark/parsers/shared/get_vapp_template.rb b/lib/fog/terremark/parsers/shared/get_vapp_template.rb
index 0bda28b07..ef8690986 100644
--- a/lib/fog/terremark/parsers/shared/get_vapp_template.rb
+++ b/lib/fog/terremark/parsers/shared/get_vapp_template.rb
@@ -34,7 +34,7 @@ module Fog
 
           def end_element(name)
             if name == 'Description'
-              @response['Description'] = @value
+              @response['Description'] = value
             end
           end
 
diff --git a/lib/fog/terremark/parsers/shared/get_vdc.rb b/lib/fog/terremark/parsers/shared/get_vdc.rb
index 9ed1d30f8..10aca1e4b 100644
--- a/lib/fog/terremark/parsers/shared/get_vdc.rb
+++ b/lib/fog/terremark/parsers/shared/get_vdc.rb
@@ -90,15 +90,15 @@ module Fog
             case name
             when 'Allocated', 'Limit', 'Units', 'Used'
               if @in_cpu
-                @response['ComputeCapacity']['Cpu'][name] = @value
+                @response['ComputeCapacity']['Cpu'][name] = value
               elsif @in_deployed_vms_quota
-                @response['ComputeCapacity']['DeployedVmsQuota'][name] = @value
+                @response['ComputeCapacity']['DeployedVmsQuota'][name] = value
               elsif @in_instantiated_vms_quota
-                @response['ComputeCapacity']['InstantiatedVmsQuota'][name] = @value
+                @response['ComputeCapacity']['InstantiatedVmsQuota'][name] = value
               elsif @in_memory
-                @response['ComputeCapacity']['Memory'][name] = @value
+                @response['ComputeCapacity']['Memory'][name] = value
               elsif @in_storage_capacity
-                @response['StorageCapacity'][name] = @value
+                @response['StorageCapacity'][name] = value
               end
             when 'Cpu'
               @in_cpu = false
@@ -111,7 +111,7 @@ module Fog
             when 'StorageCapacity'
               @in_storage_capacity = false
             when 'Type'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 
diff --git a/lib/fog/terremark/parsers/shared/internet_service.rb b/lib/fog/terremark/parsers/shared/internet_service.rb
index 86bc25f93..e3d4b526d 100644
--- a/lib/fog/terremark/parsers/shared/internet_service.rb
+++ b/lib/fog/terremark/parsers/shared/internet_service.rb
@@ -31,27 +31,27 @@ module Fog
           def end_element(name)
             case name
             when 'Description', 'Protocol'
-              @response[name] = @value
+              @response[name] = value
             when 'Enabled'
-              if @value == 'false'
+              if value == 'false'
                 @response[name] = false
               else
                 @response[name] = true
               end
             when 'Id'
               if @in_public_ip_address
-                @response['PublicIpAddress'][name] = @value.to_i
+                @response['PublicIpAddress'][name] = value.to_i
               else
-                @response[name] = @value.to_i
+                @response[name] = value.to_i
               end
             when 'Name'
               if @in_public_ip_address
-                @response['PublicIpAddress'][name] = @value
+                @response['PublicIpAddress'][name] = value
               else
-                @response[name] = @value
+                @response[name] = value
               end
             when 'Port', 'Timeout'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'PublicIpAddress'
               @in_public_ip_address = false
             end
diff --git a/lib/fog/terremark/parsers/shared/network.rb b/lib/fog/terremark/parsers/shared/network.rb
index 24f548156..3282239d6 100644
--- a/lib/fog/terremark/parsers/shared/network.rb
+++ b/lib/fog/terremark/parsers/shared/network.rb
@@ -39,7 +39,7 @@ module Fog
           def end_element(name)
             case name
             when "Gateway", "Netmask", "FenceMode"
-              @response[name.downcase] = @value
+              @response[name.downcase] = value
             end
           end
 
diff --git a/lib/fog/terremark/parsers/shared/node_service.rb b/lib/fog/terremark/parsers/shared/node_service.rb
index d4e4338e4..5396384ab 100644
--- a/lib/fog/terremark/parsers/shared/node_service.rb
+++ b/lib/fog/terremark/parsers/shared/node_service.rb
@@ -12,15 +12,15 @@ module Fog
           def end_element(name)
             case name
             when 'Description', 'Href', 'IpAddress', 'Name', 'Protocol'
-              @response[name] = @value
+              @response[name] = value
             when 'Enabled'
-              if @value == 'false'
+              if value == 'false'
                 @response[name] = false
               else
                 @response[name] = true
               end
             when 'Id', 'Port'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             end
           end
 
diff --git a/lib/fog/terremark/parsers/shared/public_ip.rb b/lib/fog/terremark/parsers/shared/public_ip.rb
index 40191e216..ac869c1dc 100644
--- a/lib/fog/terremark/parsers/shared/public_ip.rb
+++ b/lib/fog/terremark/parsers/shared/public_ip.rb
@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'Href', 'Name'
-              @response[name.downcase] = @value
+              @response[name.downcase] = value
             when 'Id'
-              @response['id'] = @value.to_i
+              @response['id'] = value.to_i
             end
           end
 
diff --git a/lib/fog/terremark/parsers/shared/vapp.rb b/lib/fog/terremark/parsers/shared/vapp.rb
index 57783169a..f6adca02f 100644
--- a/lib/fog/terremark/parsers/shared/vapp.rb
+++ b/lib/fog/terremark/parsers/shared/vapp.rb
@@ -39,15 +39,15 @@ module Fog
           def end_element(name)
             case name
             when 'IpAddress'
-              @response['IpAddress'] = @value
+              @response['IpAddress'] = value
             when 'Description'
               if @in_operating_system
-                @response['OperatingSystem'][name] = @value
+                @response['OperatingSystem'][name] = value
                 @in_operating_system = false
               end
             when 'ResourceType'
-              @resource_type = @value
-              case @value
+              @resource_type = value
+              case value
               when '3'
                 @get_cpu = true # cpu
               when '4'  # memory
@@ -58,12 +58,12 @@ module Fog
             when 'VirtualQuantity'
               case @resource_type
               when '3'
-                @response['VirtualHardware']['cpu'] = @value
+                @response['VirtualHardware']['cpu'] = value
               when '4'
-                @response['VirtualHardware']['ram'] = @value
+                @response['VirtualHardware']['ram'] = value
               when '17'
                 @response['VirtualHardware']['disks'] ||= []
-                @response['VirtualHardware']['disks'] << @value
+                @response['VirtualHardware']['disks'] << value
               end
             end
           end