diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroup.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroup.java
index 10a3e314e4..cc08e369ad 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroup.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroup.java
@@ -71,4 +71,4 @@ public class CloudStackSecurityGroupToSecurityGroup implements Function<org.jclo
       
       return builder.build();
    }
-}
\ No newline at end of file
+}
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/IngressRuleToIpPermission.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/IngressRuleToIpPermission.java
index ed0456836b..4834743252 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/IngressRuleToIpPermission.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/IngressRuleToIpPermission.java
@@ -52,4 +52,4 @@ public class IngressRuleToIpPermission implements Function<IngressRule, IpPermis
       
       return builder.build();
    }
-}
\ No newline at end of file
+}
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java
index 415b90109f..a1d3aa71d2 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java
@@ -159,5 +159,3 @@ public class ZoneSecurityGroupNamePortsCidrs extends ZoneAndName {
       return string().toString();
    }
 }
-
-   
\ No newline at end of file
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/EC2SecurityGroupToSecurityGroup.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/EC2SecurityGroupToSecurityGroup.java
index 7e0ff667cd..c46ca68a45 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/EC2SecurityGroupToSecurityGroup.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/EC2SecurityGroupToSecurityGroup.java
@@ -92,4 +92,4 @@ public class EC2SecurityGroupToSecurityGroup implements Function<org.jclouds.ec2
          return null;
       }
    }
-}
\ No newline at end of file
+}
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupToSecurityGroup.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupToSecurityGroup.java
index 3e8b8a699a..3b70ae7551 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupToSecurityGroup.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupToSecurityGroup.java
@@ -71,4 +71,4 @@ public class NovaSecurityGroupToSecurityGroup implements Function<org.jclouds.op
       
       return builder.build();
    }
-}
\ No newline at end of file
+}
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/SecurityGroupRuleToIpPermission.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/SecurityGroupRuleToIpPermission.java
index c2e5e64cd1..b5ea3e6853 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/SecurityGroupRuleToIpPermission.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/SecurityGroupRuleToIpPermission.java
@@ -54,4 +54,4 @@ public class SecurityGroupRuleToIpPermission implements Function<SecurityGroupRu
       
       return builder.build();
    }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/jclouds/lifecycle/Closer.java b/core/src/main/java/org/jclouds/lifecycle/Closer.java
index 6827e70b10..0bfa322092 100644
--- a/core/src/main/java/org/jclouds/lifecycle/Closer.java
+++ b/core/src/main/java/org/jclouds/lifecycle/Closer.java
@@ -25,8 +25,11 @@ import java.util.concurrent.atomic.AtomicReference;
 import javax.inject.Singleton;
 
 import com.google.common.collect.Lists;
+import com.google.common.util.concurrent.Atomics;
 
-import static org.jclouds.lifecycle.Closer.State.*;
+import static org.jclouds.lifecycle.Closer.State.AVAILABLE;
+import static org.jclouds.lifecycle.Closer.State.DONE;
+import static org.jclouds.lifecycle.Closer.State.PROCESSING;
 
 /**
  * This will close objects in the reverse order that they were added.
@@ -47,7 +50,7 @@ public class Closer implements Closeable {
    private final AtomicReference<State> state;
 
    public Closer() {
-      this.state = new AtomicReference<State>(AVAILABLE);
+      this.state = Atomics.newReference(AVAILABLE);
    }
 
    public void addToClose(Closeable toClose) {