diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_Cleanup.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_Cleanup.java
index f1fb114f24f..4e8eda6391f 100644
--- a/src/main/java/forge/card/abilityFactory/AbilityFactory_Cleanup.java
+++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_Cleanup.java
@@ -6,24 +6,29 @@ import forge.card.spellability.SpellAbility;
 import java.util.HashMap;
 
 // Cleanup is not the same as other AFs, it is only used as a Drawback, and only used to Cleanup particular card states
-// That need to be reset. I'm creating this to clear Remembered Cards at the end of an Effect so they don't get shown on a card
-// After the effect finishes resolving. 
+// That need to be reset. I'm creating this to clear Remembered Cards at the
+// end of an Effect so they don't get shown on a card
+// After the effect finishes resolving.
 /**
  * <p>AbilityFactory_Cleanup class.</p>
  *
  * @author Forge
  * @version $Id$
  */
-public class AbilityFactory_Cleanup {
+public final class AbilityFactory_Cleanup {
+
+    private AbilityFactory_Cleanup() {
+        throw new AssertionError();
+    }
 
     /**
      * <p>getDrawback.</p>
      *
-     * @param AF a {@link forge.card.abilityFactory.AbilityFactory} object.
+     * @param af a {@link forge.card.abilityFactory.AbilityFactory} object.
      * @return a {@link forge.card.spellability.Ability_Sub} object.
      */
-    public static Ability_Sub getDrawback(final AbilityFactory AF) {
-        final Ability_Sub drawback = new Ability_Sub(AF.getHostCard(), AF.getAbTgt()) {
+    public static Ability_Sub getDrawback(final AbilityFactory af) {
+        final Ability_Sub drawback = new Ability_Sub(af.getHostCard(), af.getAbTgt()) {
             private static final long serialVersionUID = 6192972525033429820L;
 
             @Override
@@ -32,13 +37,13 @@ public class AbilityFactory_Cleanup {
             }
 
             @Override
-            public boolean doTrigger(boolean mandatory) {
+            public boolean doTrigger(final boolean mandatory) {
                 return true;
             }
 
             @Override
             public void resolve() {
-                doResolve(AF, this);
+                doResolve(af, this);
             }
         };
 
@@ -51,12 +56,15 @@ public class AbilityFactory_Cleanup {
      * @param AF a {@link forge.card.abilityFactory.AbilityFactory} object.
      * @param sa a {@link forge.card.spellability.SpellAbility} object.
      */
-    private static void doResolve(AbilityFactory AF, SpellAbility sa) {
-        HashMap<String, String> params = AF.getMapParams();
+    private static void doResolve(final AbilityFactory af, final SpellAbility sa) {
+        HashMap<String, String> params = af.getMapParams();
 
-        if (params.containsKey("ClearRemembered"))
+        if (params.containsKey("ClearRemembered")) {
             sa.getSourceCard().clearRemembered();
-        if (params.containsKey("ClearImprinted"))
+        }
+        if (params.containsKey("ClearImprinted")) {
             sa.getSourceCard().clearImprinted();
+        }
     }
-}
+
+} //end class AbilityFactory_Cleanup