killbill-memoizeit

diff --git a/account/pom.xml b/account/pom.xml
index 498e332..216785f 100644
--- a/account/pom.xml
+++ b/account/pom.xml
@@ -8,7 +8,8 @@
     OR CONDITIONS OF ANY KIND, either express or implied. See the ~ License for 
     the specific language governing permissions and limitations ~ under the License. -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.ning.billing</groupId>

diff --git a/account/src/main/java/com/ning/billing/account/api/DefaultAccount.java b/account/src/main/java/com/ning/billing/account/api/DefaultAccount.java
index 00477dd..022ada4 100644
--- a/account/src/main/java/com/ning/billing/account/api/DefaultAccount.java
+++ b/account/src/main/java/com/ning/billing/account/api/DefaultAccount.java
@@ -18,56 +18,56 @@ package com.ning.billing.account.api;
 
 import java.util.UUID;
 
-import com.ning.billing.util.entity.EntityBase;
 import org.joda.time.DateTimeZone;
 
 import com.ning.billing.catalog.api.Currency;
 import com.ning.billing.junction.api.BlockingState;
+import com.ning.billing.util.entity.EntityBase;
 
 public class DefaultAccount extends EntityBase implements Account {
     private final String externalKey;
-	private final String email;
-	private final String name;
-	private final int firstNameLength;
-	private final Currency currency;
-	private final int billCycleDay;
-	private final UUID paymentMethodId;
-	private final DateTimeZone timeZone;
-	private final String locale;
-	private final String address1;
-	private final String address2;
-	private final String companyName;
-	private final String city;
-	private final String stateOrProvince;
-	private final String country;
-	private final String postalCode;
-	private final String phone;
+    private final String email;
+    private final String name;
+    private final int firstNameLength;
+    private final Currency currency;
+    private final int billCycleDay;
+    private final UUID paymentMethodId;
+    private final DateTimeZone timeZone;
+    private final String locale;
+    private final String address1;
+    private final String address2;
+    private final String companyName;
+    private final String city;
+    private final String stateOrProvince;
+    private final String country;
+    private final String postalCode;
+    private final String phone;
     private final boolean isMigrated;
     private final boolean isNotifiedForInvoices;
 
     public DefaultAccount(final AccountData data) {
-		this(UUID.randomUUID(), data);
-	}
-
-	/**
-	 * This call is used to update an existing account
-	 *
-	 * @param id UUID id of the existing account to update
-	 * @param data AccountData new data for the existing account
-	 */
-	public DefaultAccount(final UUID id, final AccountData data) {
-		this(id, data.getExternalKey(), data.getEmail(), data.getName(), data.getFirstNameLength(),
-				data.getCurrency(), data.getBillCycleDay(), data.getPaymentMethodId(),
-				data.getTimeZone(), data.getLocale(),
-				data.getAddress1(), data.getAddress2(), data.getCompanyName(),
-				data.getCity(), data.getStateOrProvince(), data.getCountry(),
-				data.getPostalCode(), data.getPhone(), data.isMigrated(), data.isNotifiedForInvoices());
-	}
-
-	/*
-	 * This call is used for testing and update from an existing account
+        this(UUID.randomUUID(), data);
+    }
+
+    /**
+     * This call is used to update an existing account
+     *
+     * @param id   UUID id of the existing account to update
+     * @param data AccountData new data for the existing account
      */
-	public DefaultAccount(final UUID id, final String externalKey, final String email,
+    public DefaultAccount(final UUID id, final AccountData data) {
+        this(id, data.getExternalKey(), data.getEmail(), data.getName(), data.getFirstNameLength(),
+             data.getCurrency(), data.getBillCycleDay(), data.getPaymentMethodId(),
+             data.getTimeZone(), data.getLocale(),
+             data.getAddress1(), data.getAddress2(), data.getCompanyName(),
+             data.getCity(), data.getStateOrProvince(), data.getCountry(),
+             data.getPostalCode(), data.getPhone(), data.isMigrated(), data.isNotifiedForInvoices());
+    }
+
+    /*
+    * This call is used for testing and update from an existing account
+    */
+    public DefaultAccount(final UUID id, final String externalKey, final String email,
                           final String name, final int firstNameLength,
                           final Currency currency, final int billCycleDay, final UUID paymentMethodId,
                           final DateTimeZone timeZone, final String locale,
@@ -75,107 +75,107 @@ public class DefaultAccount extends EntityBase implements Account {
                           final String city, final String stateOrProvince, final String country,
                           final String postalCode, final String phone,
                           final boolean isMigrated, final boolean isNotifiedForInvoices) {
-		super(id);
-		this.externalKey = externalKey;
-		this.email = email;
-		this.name = name;
-		this.firstNameLength = firstNameLength;
-		this.currency = currency;
-		this.billCycleDay = billCycleDay;
-		this.paymentMethodId = paymentMethodId;
-		this.timeZone = timeZone;
-		this.locale = locale;
-		this.address1 = address1;
-		this.address2 = address2;
-		this.companyName = companyName;
-		this.city = city;
-		this.stateOrProvince = stateOrProvince;
-		this.postalCode = postalCode;
-		this.country = country;
-		this.phone = phone;
+        super(id);
+        this.externalKey = externalKey;
+        this.email = email;
+        this.name = name;
+        this.firstNameLength = firstNameLength;
+        this.currency = currency;
+        this.billCycleDay = billCycleDay;
+        this.paymentMethodId = paymentMethodId;
+        this.timeZone = timeZone;
+        this.locale = locale;
+        this.address1 = address1;
+        this.address2 = address2;
+        this.companyName = companyName;
+        this.city = city;
+        this.stateOrProvince = stateOrProvince;
+        this.postalCode = postalCode;
+        this.country = country;
+        this.phone = phone;
         this.isMigrated = isMigrated;
         this.isNotifiedForInvoices = isNotifiedForInvoices;
-	}
-
-	@Override
-	public String getExternalKey() {
-		return externalKey;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public String getEmail() {
-		return email;
-	}
-
-	@Override
-	public int getFirstNameLength() {
-		return firstNameLength;
-	}
-
-	@Override
-	public Currency getCurrency() {
-		return currency;
-	}
-
-	@Override
-	public int getBillCycleDay() {
-		return billCycleDay;
-	}
-
-	@Override
-	public UUID getPaymentMethodId() {
-		return paymentMethodId;
-	}
-
-	@Override
-	public DateTimeZone getTimeZone() {
-		return timeZone;
-	}
-
-	@Override
-	public String getLocale() {
-		return locale;
-	}
-
-	@Override
-	public String getAddress1() {
-		return address1;
-	}
-
-	@Override
-	public String getAddress2() {
-		return address2;
-	}
-
-	@Override
-	public String getCompanyName() {
-		return companyName;
-	}
-
-	@Override
-	public String getCity() {
-		return city;
-	}
-
-	@Override
-	public String getStateOrProvince() {
-		return stateOrProvince;
-	}
-
-	@Override
-	public String getPostalCode() {
-		return postalCode;
-	}
-
-	@Override
-	public String getCountry() {
-		return country;
-	}
+    }
+
+    @Override
+    public String getExternalKey() {
+        return externalKey;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String getEmail() {
+        return email;
+    }
+
+    @Override
+    public int getFirstNameLength() {
+        return firstNameLength;
+    }
+
+    @Override
+    public Currency getCurrency() {
+        return currency;
+    }
+
+    @Override
+    public int getBillCycleDay() {
+        return billCycleDay;
+    }
+
+    @Override
+    public UUID getPaymentMethodId() {
+        return paymentMethodId;
+    }
+
+    @Override
+    public DateTimeZone getTimeZone() {
+        return timeZone;
+    }
+
+    @Override
+    public String getLocale() {
+        return locale;
+    }
+
+    @Override
+    public String getAddress1() {
+        return address1;
+    }
+
+    @Override
+    public String getAddress2() {
+        return address2;
+    }
+
+    @Override
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    @Override
+    public String getCity() {
+        return city;
+    }
+
+    @Override
+    public String getStateOrProvince() {
+        return stateOrProvince;
+    }
+
+    @Override
+    public String getPostalCode() {
+        return postalCode;
+    }
+
+    @Override
+    public String getCountry() {
+        return country;
+    }
 
     @Override
     public boolean isMigrated() {
@@ -188,39 +188,39 @@ public class DefaultAccount extends EntityBase implements Account {
     }
 
     @Override
-	public String getPhone() {
-		return phone;
-	}
+    public String getPhone() {
+        return phone;
+    }
 
     @Override
-	public MutableAccountData toMutableAccountData() {
-	    return new DefaultMutableAccountData(this);
-	}
-    
-	@Override
-	public String toString() {
-		return "DefaultAccount [externalKey=" + externalKey +
+    public MutableAccountData toMutableAccountData() {
+        return new DefaultMutableAccountData(this);
+    }
+
+    @Override
+    public String toString() {
+        return "DefaultAccount [externalKey=" + externalKey +
                 ", email=" + email +
-				", name=" + name +
-				", firstNameLength=" + firstNameLength +
-				", phone=" + phone +
-				", currency=" + currency +
-				", billCycleDay=" + billCycleDay +
-				", paymentMethodId=" + paymentMethodId +
-				", timezone=" + timeZone +
-				", locale=" +  locale +
-				", address1=" + address1 +
-				", address2=" + address2 +
-				", companyName=" + companyName +
-				", city=" + city +
-				", stateOrProvince=" + stateOrProvince +
-				", postalCode=" + postalCode +
-				", country=" + country +
-				"]";
-	}
-
-	@Override
-	public BlockingState getBlockingState() {
-	    throw new UnsupportedOperationException();
-	}
-}
\ No newline at end of file
+                ", name=" + name +
+                ", firstNameLength=" + firstNameLength +
+                ", phone=" + phone +
+                ", currency=" + currency +
+                ", billCycleDay=" + billCycleDay +
+                ", paymentMethodId=" + paymentMethodId +
+                ", timezone=" + timeZone +
+                ", locale=" + locale +
+                ", address1=" + address1 +
+                ", address2=" + address2 +
+                ", companyName=" + companyName +
+                ", city=" + city +
+                ", stateOrProvince=" + stateOrProvince +
+                ", postalCode=" + postalCode +
+                ", country=" + country +
+                "]";
+    }
+
+    @Override
+    public BlockingState getBlockingState() {
+        throw new UnsupportedOperationException();
+    }
+}

diff --git a/account/src/main/java/com/ning/billing/account/api/DefaultAccountService.java b/account/src/main/java/com/ning/billing/account/api/DefaultAccountService.java
index af3d2a7..9b0cfc1 100644
--- a/account/src/main/java/com/ning/billing/account/api/DefaultAccountService.java
+++ b/account/src/main/java/com/ning/billing/account/api/DefaultAccountService.java
@@ -21,7 +21,7 @@ public class DefaultAccountService implements AccountService {
 
     private static final String ACCOUNT_SERVICE_NAME = "account-service";
 
-   @Override
+    @Override
     public String getName() {
         return ACCOUNT_SERVICE_NAME;
     }

diff --git a/account/src/main/java/com/ning/billing/account/api/DefaultChangedField.java b/account/src/main/java/com/ning/billing/account/api/DefaultChangedField.java
index 89a65f6..8501b9f 100644
--- a/account/src/main/java/com/ning/billing/account/api/DefaultChangedField.java
+++ b/account/src/main/java/com/ning/billing/account/api/DefaultChangedField.java
@@ -16,35 +16,36 @@
 
 package com.ning.billing.account.api;
 
+import org.joda.time.DateTime;
+
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.joda.time.DateTime;
 
 public class DefaultChangedField implements ChangedField {
-    
+
     private final String fieldName;
     private final String oldValue;
     private final String newValue;
     private final DateTime changeDate;
 
     @JsonCreator
-    public DefaultChangedField(@JsonProperty("fieldName") String fieldName,
-            @JsonProperty("oldValue") String oldValue,
-            @JsonProperty("newValue") String newValue,
-            @JsonProperty("changeDate") DateTime changeDate) {
+    public DefaultChangedField(@JsonProperty("fieldName") final String fieldName,
+                               @JsonProperty("oldValue") final String oldValue,
+                               @JsonProperty("newValue") final String newValue,
+                               @JsonProperty("changeDate") final DateTime changeDate) {
         this.changeDate = changeDate;
         this.fieldName = fieldName;
         this.oldValue = oldValue;
         this.newValue = newValue;
     }
 
-    public DefaultChangedField(String fieldName,
-            String oldValue,
-            String newValue) {
+    public DefaultChangedField(final String fieldName,
+                               final String oldValue,
+                               final String newValue) {
         this(fieldName, oldValue, newValue, new DateTime());
     }
 
-    
+
     @Override
     public String getFieldName() {
         return fieldName;
@@ -81,35 +82,46 @@ public class DefaultChangedField implements ChangedField {
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
+    public boolean equals(final Object obj) {
+        if (this == obj) {
             return true;
-        if (obj == null)
+        }
+        if (obj == null) {
             return false;
-        if (getClass() != obj.getClass())
+        }
+        if (getClass() != obj.getClass()) {
             return false;
-        DefaultChangedField other = (DefaultChangedField) obj;
+        }
+        final DefaultChangedField other = (DefaultChangedField) obj;
         if (changeDate == null) {
-            if (other.changeDate != null)
+            if (other.changeDate != null) {
                 return false;
-        } else if (changeDate.compareTo(other.changeDate) != 0)
+            }
+        } else if (changeDate.compareTo(other.changeDate) != 0) {
             return false;
+        }
         if (fieldName == null) {
-            if (other.fieldName != null)
+            if (other.fieldName != null) {
                 return false;
-        } else if (!fieldName.equals(other.fieldName))
+            }
+        } else if (!fieldName.equals(other.fieldName)) {
             return false;
+        }
         if (newValue == null) {
-            if (other.newValue != null)
+            if (other.newValue != null) {
                 return false;
-        } else if (!newValue.equals(other.newValue))
+            }
+        } else if (!newValue.equals(other.newValue)) {
             return false;
+        }
         if (oldValue == null) {
-            if (other.oldValue != null)
+            if (other.oldValue != null) {
                 return false;
-        } else if (!oldValue.equals(other.oldValue))
+            }
+        } else if (!oldValue.equals(other.oldValue)) {
             return false;
+        }
         return true;
     }
-    
+
 }

diff --git a/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountChangeEvent.java b/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountChangeEvent.java
index 412bc5e..e8ceefb 100644
--- a/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountChangeEvent.java
+++ b/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountChangeEvent.java
@@ -16,6 +16,10 @@
 
 package com.ning.billing.account.api.user;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -25,21 +29,17 @@ import com.ning.billing.account.api.AccountChangeEvent;
 import com.ning.billing.account.api.ChangedField;
 import com.ning.billing.account.api.DefaultChangedField;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
 public class DefaultAccountChangeEvent implements AccountChangeEvent {
-	
-	private final UUID userToken;
+
+    private final UUID userToken;
     private final List<ChangedField> changedFields;
     private final UUID accountId;
 
-    
+
     @JsonCreator
-    public DefaultAccountChangeEvent(@JsonProperty("userToken") UUID userToken,
-            @JsonProperty("changeFields") List<ChangedField> changedFields,
-            @JsonProperty("accountId") UUID accountId) {
+    public DefaultAccountChangeEvent(@JsonProperty("userToken") final UUID userToken,
+                                     @JsonProperty("changeFields") final List<ChangedField> changedFields,
+                                     @JsonProperty("accountId") final UUID accountId) {
         super();
         this.userToken = userToken;
         this.accountId = accountId;
@@ -48,22 +48,22 @@ public class DefaultAccountChangeEvent implements AccountChangeEvent {
         //this.changedFields.addAll(changedFields);
     }
 
-    public DefaultAccountChangeEvent(UUID id, UUID userToken, Account oldData, Account newData) {
+    public DefaultAccountChangeEvent(final UUID id, final UUID userToken, final Account oldData, final Account newData) {
         this.accountId = id;
         this.userToken = userToken;
         this.changedFields = calculateChangedFields(oldData, newData);
     }
 
     @JsonIgnore
-	@Override
-	public BusEventType getBusEventType() {
-		return BusEventType.ACCOUNT_CHANGE;
-	}
+    @Override
+    public BusEventType getBusEventType() {
+        return BusEventType.ACCOUNT_CHANGE;
+    }
 
     @Override
     public UUID getUserToken() {
         return userToken;
-	}
+    }
 
     @Override
     public UUID getAccountId() {
@@ -96,62 +96,71 @@ public class DefaultAccountChangeEvent implements AccountChangeEvent {
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
+    public boolean equals(final Object obj) {
+        if (this == obj) {
             return true;
-        if (obj == null)
+        }
+        if (obj == null) {
             return false;
-        if (getClass() != obj.getClass())
+        }
+        if (getClass() != obj.getClass()) {
             return false;
-        DefaultAccountChangeEvent other = (DefaultAccountChangeEvent) obj;
+        }
+        final DefaultAccountChangeEvent other = (DefaultAccountChangeEvent) obj;
         if (accountId == null) {
-            if (other.accountId != null)
+            if (other.accountId != null) {
                 return false;
-        } else if (!accountId.equals(other.accountId))
+            }
+        } else if (!accountId.equals(other.accountId)) {
             return false;
+        }
         if (changedFields == null) {
-            if (other.changedFields != null)
+            if (other.changedFields != null) {
                 return false;
-        } else if (!changedFields.equals(other.changedFields))
+            }
+        } else if (!changedFields.equals(other.changedFields)) {
             return false;
+        }
         if (userToken == null) {
-            if (other.userToken != null)
+            if (other.userToken != null) {
                 return false;
-        } else if (!userToken.equals(other.userToken))
+            }
+        } else if (!userToken.equals(other.userToken)) {
             return false;
+        }
         return true;
     }
 
-    private List<ChangedField> calculateChangedFields(Account oldData, Account newData) {
+    private List<ChangedField> calculateChangedFields(final Account oldData, final Account newData) {
 
-        List<ChangedField> tmpChangedFields = new ArrayList<ChangedField>();
+        final List<ChangedField> tmpChangedFields = new ArrayList<ChangedField>();
 
         addIfValueChanged(tmpChangedFields, "externalKey",
-                oldData.getExternalKey(), newData.getExternalKey());
+                          oldData.getExternalKey(), newData.getExternalKey());
 
         addIfValueChanged(tmpChangedFields, "email",
-                oldData.getEmail(), newData.getEmail());
+                          oldData.getEmail(), newData.getEmail());
 
         addIfValueChanged(tmpChangedFields, "firstName",
-                oldData.getName(), newData.getName());
+                          oldData.getName(), newData.getName());
 
         addIfValueChanged(tmpChangedFields, "currency",
-                (oldData.getCurrency() != null) ? oldData.getCurrency().toString() : null,
-                 (newData.getCurrency() != null) ? newData.getCurrency().toString() : null);
+                          (oldData.getCurrency() != null) ? oldData.getCurrency().toString() : null,
+                          (newData.getCurrency() != null) ? newData.getCurrency().toString() : null);
 
         addIfValueChanged(tmpChangedFields,
-                "billCycleDay",
-                Integer.toString(oldData.getBillCycleDay()), Integer.toString(newData.getBillCycleDay()));
+                          "billCycleDay",
+                          Integer.toString(oldData.getBillCycleDay()), Integer.toString(newData.getBillCycleDay()));
 
-        addIfValueChanged(tmpChangedFields,"paymentMethodId",
-                (oldData.getPaymentMethodId() != null) ? oldData.getPaymentMethodId().toString() : null,
-                (newData.getPaymentMethodId() != null) ? newData.getPaymentMethodId().toString(): null);
+        addIfValueChanged(tmpChangedFields, "paymentMethodId",
+                          (oldData.getPaymentMethodId() != null) ? oldData.getPaymentMethodId().toString() : null,
+                          (newData.getPaymentMethodId() != null) ? newData.getPaymentMethodId().toString() : null);
 
         addIfValueChanged(tmpChangedFields, "locale", oldData.getLocale(), newData.getLocale());
 
         addIfValueChanged(tmpChangedFields, "timeZone",
-                (oldData.getTimeZone() == null) ? null : oldData.getTimeZone().toString(),
-                (newData.getTimeZone() == null) ? null : newData.getTimeZone().toString());
+                          (oldData.getTimeZone() == null) ? null : oldData.getTimeZone().toString(),
+                          (newData.getTimeZone() == null) ? null : newData.getTimeZone().toString());
 
         addIfValueChanged(tmpChangedFields, "address1", oldData.getAddress1(), newData.getAddress1());
         addIfValueChanged(tmpChangedFields, "address2", oldData.getAddress2(), newData.getAddress2());
@@ -164,14 +173,13 @@ public class DefaultAccountChangeEvent implements AccountChangeEvent {
         return tmpChangedFields;
     }
 
-    private void addIfValueChanged(List<ChangedField> inputList, String key, String oldData, String newData) {
+    private void addIfValueChanged(final List<ChangedField> inputList, final String key, final String oldData, final String newData) {
         // If both null => no changes
         if (newData == null && oldData == null) {
-            return;
-        // If only one is null
+            // If only one is null
         } else if (newData == null || oldData == null) {
             inputList.add(new DefaultChangedField(key, oldData, newData));
-        // If neither are null we can safely compare values
+            // If neither are null we can safely compare values
         } else if (!newData.equals(oldData)) {
             inputList.add(new DefaultChangedField(key, oldData, newData));
         }

diff --git a/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountCreationEvent.java b/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountCreationEvent.java
index 57f2504..8a6cea7 100644
--- a/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountCreationEvent.java
+++ b/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountCreationEvent.java
@@ -16,6 +16,10 @@
 
 package com.ning.billing.account.api.user;
 
+import java.util.UUID;
+
+import org.joda.time.DateTimeZone;
+
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -24,41 +28,38 @@ import com.ning.billing.account.api.AccountCreationEvent;
 import com.ning.billing.account.api.AccountData;
 import com.ning.billing.catalog.api.Currency;
 
-import java.util.UUID;
-
-import org.joda.time.DateTimeZone;
-
 public class DefaultAccountCreationEvent implements AccountCreationEvent {
-	
-	private final UUID userToken;	
+
+    private final UUID userToken;
     private final UUID id;
     private final AccountData data;
 
     @JsonCreator
-    public DefaultAccountCreationEvent(@JsonProperty("data") DefaultAccountData data,
-            @JsonProperty("userToken") UUID userToken,
-            @JsonProperty("id") UUID id) {
+    public DefaultAccountCreationEvent(@JsonProperty("data") final DefaultAccountData data,
+                                       @JsonProperty("userToken") final UUID userToken,
+                                       @JsonProperty("id") final UUID id) {
         this.id = id;
         this.userToken = userToken;
         this.data = data;
     }
-    
-    public DefaultAccountCreationEvent(Account data, UUID userToken) {
+
+    public DefaultAccountCreationEvent(final Account data, final UUID userToken) {
         this.id = data.getId();
         this.data = new DefaultAccountData(data);
         this.userToken = userToken;
     }
 
     @JsonIgnore
-	@Override
-	public BusEventType getBusEventType() {
-		return BusEventType.ACCOUNT_CREATE;
-	}
+    @Override
+    public BusEventType getBusEventType() {
+        return BusEventType.ACCOUNT_CREATE;
+    }
 
     @Override
     public UUID getUserToken() {
-    	return userToken;
+        return userToken;
     }
+
     @Override
     public UUID getId() {
         return id;
@@ -68,8 +69,8 @@ public class DefaultAccountCreationEvent implements AccountCreationEvent {
     public AccountData getData() {
         return data;
     }
-    
-    
+
+
     @Override
     public int hashCode() {
         final int prime = 31;
@@ -82,29 +83,38 @@ public class DefaultAccountCreationEvent implements AccountCreationEvent {
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
+    public boolean equals(final Object obj) {
+        if (this == obj) {
             return true;
-        if (obj == null)
+        }
+        if (obj == null) {
             return false;
-        if (getClass() != obj.getClass())
+        }
+        if (getClass() != obj.getClass()) {
             return false;
-        DefaultAccountCreationEvent other = (DefaultAccountCreationEvent) obj;
+        }
+        final DefaultAccountCreationEvent other = (DefaultAccountCreationEvent) obj;
         if (data == null) {
-            if (other.data != null)
+            if (other.data != null) {
                 return false;
-        } else if (!data.equals(other.data))
+            }
+        } else if (!data.equals(other.data)) {
             return false;
+        }
         if (id == null) {
-            if (other.id != null)
+            if (other.id != null) {
                 return false;
-        } else if (!id.equals(other.id))
+            }
+        } else if (!id.equals(other.id)) {
             return false;
+        }
         if (userToken == null) {
-            if (other.userToken != null)
+            if (other.userToken != null) {
                 return false;
-        } else if (!userToken.equals(other.userToken))
+            }
+        } else if (!userToken.equals(other.userToken)) {
             return false;
+        }
         return true;
     }
 
@@ -130,50 +140,50 @@ public class DefaultAccountCreationEvent implements AccountCreationEvent {
         private final String phone;
         private final boolean isMigrated;
         private final boolean isNotifiedForInvoices;
-        
-        
-        public DefaultAccountData(Account d) {
-            this(d.getExternalKey() != null ?  d.getExternalKey().toString() : null,
-                    d.getName(),
-                    d.getFirstNameLength(),
-                    d.getEmail(),
-                    d.getBillCycleDay(),
-                    d.getCurrency() != null ?  d.getCurrency().name() : null,
-                    d.getPaymentMethodId(), 
-                    d.getTimeZone() != null ?  d.getTimeZone().getID() : null,
-                    d.getLocale(),
-                    d.getAddress1(),
-                    d.getAddress2(),
-                    d.getCompanyName(),
-                    d.getCity(),
-                    d.getStateOrProvince(),
-                    d.getPostalCode(),
-                    d.getCountry(),
-                    d.getPhone(),
-                    d.isMigrated(),
-                    d.isNotifiedForInvoices());
+
+
+        public DefaultAccountData(final Account d) {
+            this(d.getExternalKey() != null ? d.getExternalKey() : null,
+                 d.getName(),
+                 d.getFirstNameLength(),
+                 d.getEmail(),
+                 d.getBillCycleDay(),
+                 d.getCurrency() != null ? d.getCurrency().name() : null,
+                 d.getPaymentMethodId(),
+                 d.getTimeZone() != null ? d.getTimeZone().getID() : null,
+                 d.getLocale(),
+                 d.getAddress1(),
+                 d.getAddress2(),
+                 d.getCompanyName(),
+                 d.getCity(),
+                 d.getStateOrProvince(),
+                 d.getPostalCode(),
+                 d.getCountry(),
+                 d.getPhone(),
+                 d.isMigrated(),
+                 d.isNotifiedForInvoices());
         }
-        
+
         @JsonCreator
-        public DefaultAccountData(@JsonProperty("externalKey") String externalKey,
-                @JsonProperty("name") String name,
-                @JsonProperty("firstNameLength") Integer firstNameLength,
-                @JsonProperty("email") String email,
-                @JsonProperty("billCycleDay") Integer billCycleDay,
-                @JsonProperty("currency") String currency,
-                @JsonProperty("paymentMethodId") UUID paymentMethodId,
-                @JsonProperty("timeZone") String timeZone,
-                @JsonProperty("locale") String locale,
-                @JsonProperty("address1") String address1,
-                @JsonProperty("address2") String address2,
-                @JsonProperty("companyName") String companyName,
-                @JsonProperty("city") String city,
-                @JsonProperty("stateOrProvince") String stateOrProvince,
-                @JsonProperty("postalCode") String postalCode,
-                @JsonProperty("country") String country,
-                @JsonProperty("phone") String phone,
-                @JsonProperty("isMigrated") boolean isMigrated,
-                @JsonProperty("isNotifiedForInvoices") boolean isNotifiedForInvoices) {
+        public DefaultAccountData(@JsonProperty("externalKey") final String externalKey,
+                                  @JsonProperty("name") final String name,
+                                  @JsonProperty("firstNameLength") final Integer firstNameLength,
+                                  @JsonProperty("email") final String email,
+                                  @JsonProperty("billCycleDay") final Integer billCycleDay,
+                                  @JsonProperty("currency") final String currency,
+                                  @JsonProperty("paymentMethodId") final UUID paymentMethodId,
+                                  @JsonProperty("timeZone") final String timeZone,
+                                  @JsonProperty("locale") final String locale,
+                                  @JsonProperty("address1") final String address1,
+                                  @JsonProperty("address2") final String address2,
+                                  @JsonProperty("companyName") final String companyName,
+                                  @JsonProperty("city") final String city,
+                                  @JsonProperty("stateOrProvince") final String stateOrProvince,
+                                  @JsonProperty("postalCode") final String postalCode,
+                                  @JsonProperty("country") final String country,
+                                  @JsonProperty("phone") final String phone,
+                                  @JsonProperty("isMigrated") final boolean isMigrated,
+                                  @JsonProperty("isNotifiedForInvoices") final boolean isNotifiedForInvoices) {
             super();
             this.externalKey = externalKey;
             this.name = name;
@@ -231,7 +241,7 @@ public class DefaultAccountCreationEvent implements AccountCreationEvent {
         public DateTimeZone getTimeZone() {
             return DateTimeZone.forID(timeZone);
         }
-        
+
         @JsonProperty("timeZone")
         public String getTimeZoneString() {
             return timeZone;
@@ -322,120 +332,157 @@ public class DefaultAccountCreationEvent implements AccountCreationEvent {
             result = prime
                     * result
                     + ((firstNameLength == null) ? 0 : firstNameLength
-                            .hashCode());
+                    .hashCode());
             result = prime * result
                     + ((locale == null) ? 0 : locale.hashCode());
             result = prime * result + ((name == null) ? 0 : name.hashCode());
             result = prime
                     * result
                     + ((paymentMethodId == null) ? 0 : paymentMethodId
-                            .hashCode());
+                    .hashCode());
             result = prime * result + ((phone == null) ? 0 : phone.hashCode());
             result = prime * result
                     + ((postalCode == null) ? 0 : postalCode.hashCode());
             result = prime
                     * result
                     + ((stateOrProvince == null) ? 0 : stateOrProvince
-                            .hashCode());
+                    .hashCode());
             result = prime * result
                     + ((timeZone == null) ? 0 : timeZone.hashCode());
             return result;
         }
 
         @Override
-        public boolean equals(Object obj) {
-            if (this == obj)
+        public boolean equals(final Object obj) {
+            if (this == obj) {
                 return true;
-            if (obj == null)
+            }
+            if (obj == null) {
                 return false;
-            if (getClass() != obj.getClass())
+            }
+            if (getClass() != obj.getClass()) {
                 return false;
-            DefaultAccountData other = (DefaultAccountData) obj;
+            }
+            final DefaultAccountData other = (DefaultAccountData) obj;
             if (address1 == null) {
-                if (other.address1 != null)
+                if (other.address1 != null) {
                     return false;
-            } else if (!address1.equals(other.address1))
+                }
+            } else if (!address1.equals(other.address1)) {
                 return false;
+            }
             if (address2 == null) {
-                if (other.address2 != null)
+                if (other.address2 != null) {
                     return false;
-            } else if (!address2.equals(other.address2))
+                }
+            } else if (!address2.equals(other.address2)) {
                 return false;
+            }
             if (billCycleDay == null) {
-                if (other.billCycleDay != null)
+                if (other.billCycleDay != null) {
                     return false;
-            } else if (!billCycleDay.equals(other.billCycleDay))
+                }
+            } else if (!billCycleDay.equals(other.billCycleDay)) {
                 return false;
+            }
             if (city == null) {
-                if (other.city != null)
+                if (other.city != null) {
                     return false;
-            } else if (!city.equals(other.city))
+                }
+            } else if (!city.equals(other.city)) {
                 return false;
+            }
             if (companyName == null) {
-                if (other.companyName != null)
+                if (other.companyName != null) {
                     return false;
-            } else if (!companyName.equals(other.companyName))
+                }
+            } else if (!companyName.equals(other.companyName)) {
                 return false;
+            }
             if (country == null) {
-                if (other.country != null)
+                if (other.country != null) {
                     return false;
-            } else if (!country.equals(other.country))
+                }
+            } else if (!country.equals(other.country)) {
                 return false;
+            }
             if (currency == null) {
-                if (other.currency != null)
+                if (other.currency != null) {
                     return false;
-            } else if (!currency.equals(other.currency))
+                }
+            } else if (!currency.equals(other.currency)) {
                 return false;
+            }
             if (email == null) {
-                if (other.email != null)
+                if (other.email != null) {
                     return false;
-            } else if (!email.equals(other.email))
+                }
+            } else if (!email.equals(other.email)) {
                 return false;
+            }
             if (externalKey == null) {
-                if (other.externalKey != null)
+                if (other.externalKey != null) {
                     return false;
-            } else if (!externalKey.equals(other.externalKey))
+                }
+            } else if (!externalKey.equals(other.externalKey)) {
                 return false;
+            }
             if (firstNameLength == null) {
-                if (other.firstNameLength != null)
+                if (other.firstNameLength != null) {
                     return false;
-            } else if (!firstNameLength.equals(other.firstNameLength))
+                }
+            } else if (!firstNameLength.equals(other.firstNameLength)) {
                 return false;
+            }
             if (locale == null) {
-                if (other.locale != null)
+                if (other.locale != null) {
                     return false;
-            } else if (!locale.equals(other.locale))
+                }
+            } else if (!locale.equals(other.locale)) {
                 return false;
+            }
             if (name == null) {
-                if (other.name != null)
+                if (other.name != null) {
                     return false;
-            } else if (!name.equals(other.name))
+                }
+            } else if (!name.equals(other.name)) {
                 return false;
+            }
             if (paymentMethodId == null) {
-                if (other.paymentMethodId != null)
+                if (other.paymentMethodId != null) {
                     return false;
-            } else if (!paymentMethodId.equals(other.paymentMethodId))
+                }
+            } else if (!paymentMethodId.equals(other.paymentMethodId)) {
                 return false;
+            }
             if (phone == null) {
-                if (other.phone != null)
+                if (other.phone != null) {
                     return false;
-            } else if (!phone.equals(other.phone))
+                }
+            } else if (!phone.equals(other.phone)) {
                 return false;
+            }
             if (postalCode == null) {
-                if (other.postalCode != null)
+                if (other.postalCode != null) {
                     return false;
-            } else if (!postalCode.equals(other.postalCode))
+                }
+            } else if (!postalCode.equals(other.postalCode)) {
                 return false;
+            }
             if (stateOrProvince == null) {
-                if (other.stateOrProvince != null)
+                if (other.stateOrProvince != null) {
                     return false;
-            } else if (!stateOrProvince.equals(other.stateOrProvince))
+                }
+            } else if (!stateOrProvince.equals(other.stateOrProvince)) {
                 return false;
+            }
             if (timeZone == null) {
-                if (other.timeZone != null)
+                if (other.timeZone != null) {
                     return false;
-            } else if (!timeZone.equals(other.timeZone))
+                }
+            } else if (!timeZone.equals(other.timeZone)) {
                 return false;
+            }
             return true;
         }
     }

diff --git a/account/src/main/java/com/ning/billing/account/dao/AccountBinder.java b/account/src/main/java/com/ning/billing/account/dao/AccountBinder.java
index 79b265d..a170b64 100644
--- a/account/src/main/java/com/ning/billing/account/dao/AccountBinder.java
+++ b/account/src/main/java/com/ning/billing/account/dao/AccountBinder.java
@@ -16,19 +16,20 @@
 
 package com.ning.billing.account.dao;
 
-import com.ning.billing.account.api.Account;
-import com.ning.billing.catalog.api.Currency;
+import java.lang.annotation.Annotation;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
 import org.joda.time.DateTimeZone;
 import org.skife.jdbi.v2.SQLStatement;
 import org.skife.jdbi.v2.sqlobject.Binder;
 import org.skife.jdbi.v2.sqlobject.BinderFactory;
 import org.skife.jdbi.v2.sqlobject.BindingAnnotation;
 
-import java.lang.annotation.Annotation;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import com.ning.billing.account.api.Account;
+import com.ning.billing.catalog.api.Currency;
 
 @BindingAnnotation(AccountBinder.AccountBinderFactory.class)
 @Retention(RetentionPolicy.RUNTIME)

diff --git a/account/src/main/java/com/ning/billing/account/dao/AccountDao.java b/account/src/main/java/com/ning/billing/account/dao/AccountDao.java
index 67474ab..2f3cd25 100644
--- a/account/src/main/java/com/ning/billing/account/dao/AccountDao.java
+++ b/account/src/main/java/com/ning/billing/account/dao/AccountDao.java
@@ -16,22 +16,19 @@
 
 package com.ning.billing.account.dao;
 
-import java.util.List;
 import java.util.UUID;
+
 import com.ning.billing.account.api.Account;
 import com.ning.billing.account.api.AccountApiException;
-import com.ning.billing.account.api.AccountEmail;
-import com.ning.billing.util.callcontext.CallContext;
 import com.ning.billing.util.entity.dao.UpdatableEntityDao;
 
 public interface AccountDao extends UpdatableEntityDao<Account> {
     public Account getAccountByKey(String key);
 
-    /***
-     *
+    /**
      * @param externalKey
      * @return
      * @throws AccountApiException when externalKey is null
      */
     public UUID getIdFromKey(String externalKey) throws AccountApiException;
-}
\ No newline at end of file
+}

diff --git a/account/src/main/java/com/ning/billing/account/dao/AccountEmailBinder.java b/account/src/main/java/com/ning/billing/account/dao/AccountEmailBinder.java
index bd71364..bf2cb77 100644
--- a/account/src/main/java/com/ning/billing/account/dao/AccountEmailBinder.java
+++ b/account/src/main/java/com/ning/billing/account/dao/AccountEmailBinder.java
@@ -16,28 +16,29 @@
 
 package com.ning.billing.account.dao;
 
-import com.ning.billing.account.api.AccountEmail;
-import org.skife.jdbi.v2.SQLStatement;
-import org.skife.jdbi.v2.sqlobject.Binder;
-import org.skife.jdbi.v2.sqlobject.BinderFactory;
-import org.skife.jdbi.v2.sqlobject.BindingAnnotation;
-
 import java.lang.annotation.Annotation;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.skife.jdbi.v2.SQLStatement;
+import org.skife.jdbi.v2.sqlobject.Binder;
+import org.skife.jdbi.v2.sqlobject.BinderFactory;
+import org.skife.jdbi.v2.sqlobject.BindingAnnotation;
+
+import com.ning.billing.account.api.AccountEmail;
+
 @BindingAnnotation(AccountEmailBinder.AccountEmailBinderFactory.class)
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.PARAMETER})
 public @interface AccountEmailBinder {
     public static class AccountEmailBinderFactory implements BinderFactory {
         @Override
-        public Binder<AccountEmailBinder, AccountEmail> build(Annotation annotation) {
+        public Binder<AccountEmailBinder, AccountEmail> build(final Annotation annotation) {
             return new Binder<AccountEmailBinder, AccountEmail>() {
                 @Override
-                public void bind(@SuppressWarnings("rawtypes") SQLStatement q, AccountEmailBinder bind, AccountEmail accountEmail) {
+                public void bind(@SuppressWarnings("rawtypes") final SQLStatement q, final AccountEmailBinder bind, final AccountEmail accountEmail) {
                     q.bind("id", accountEmail.getId().toString());
                     q.bind("accountId", accountEmail.getAccountId().toString());
                     q.bind("email", accountEmail.getEmail());

diff --git a/account/src/main/java/com/ning/billing/account/dao/AccountEmailHistoryBinder.java b/account/src/main/java/com/ning/billing/account/dao/AccountEmailHistoryBinder.java
index ed9ebae..f7a4db1 100644
--- a/account/src/main/java/com/ning/billing/account/dao/AccountEmailHistoryBinder.java
+++ b/account/src/main/java/com/ning/billing/account/dao/AccountEmailHistoryBinder.java
@@ -39,7 +39,7 @@ public @interface AccountEmailHistoryBinder {
         public Binder<AccountEmailHistoryBinder, EntityHistory<AccountEmail>> build(final Annotation annotation) {
             return new Binder<AccountEmailHistoryBinder, EntityHistory<AccountEmail>>() {
                 @Override
-                public void bind(SQLStatement q, final AccountEmailHistoryBinder bind, final EntityHistory<AccountEmail> history) {
+                public void bind(final SQLStatement q, final AccountEmailHistoryBinder bind, final EntityHistory<AccountEmail> history) {
                     q.bind("recordId", history.getValue());
                     q.bind("changeType", history.getChangeType().toString());
 

diff --git a/account/src/main/java/com/ning/billing/account/dao/AccountEmailMapper.java b/account/src/main/java/com/ning/billing/account/dao/AccountEmailMapper.java
index 9a46344..9bfcbee 100644
--- a/account/src/main/java/com/ning/billing/account/dao/AccountEmailMapper.java
+++ b/account/src/main/java/com/ning/billing/account/dao/AccountEmailMapper.java
@@ -16,23 +16,23 @@
 
 package com.ning.billing.account.dao;
 
-import com.ning.billing.account.api.AccountEmail;
-import com.ning.billing.account.api.DefaultAccountEmail;
-import com.ning.billing.util.dao.MapperBase;
-import org.joda.time.DateTime;
-import org.skife.jdbi.v2.StatementContext;
-import org.skife.jdbi.v2.tweak.ResultSetMapper;
-
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.UUID;
 
+import org.skife.jdbi.v2.StatementContext;
+import org.skife.jdbi.v2.tweak.ResultSetMapper;
+
+import com.ning.billing.account.api.AccountEmail;
+import com.ning.billing.account.api.DefaultAccountEmail;
+import com.ning.billing.util.dao.MapperBase;
+
 public class AccountEmailMapper extends MapperBase implements ResultSetMapper<AccountEmail> {
     @Override
-    public AccountEmail map(int index, ResultSet result, StatementContext context) throws SQLException {
-        UUID id = UUID.fromString(result.getString("id"));
-        UUID accountId = UUID.fromString(result.getString("account_id"));
-        String email = result.getString("email");
+    public AccountEmail map(final int index, final ResultSet result, final StatementContext context) throws SQLException {
+        final UUID id = UUID.fromString(result.getString("id"));
+        final UUID accountId = UUID.fromString(result.getString("account_id"));
+        final String email = result.getString("email");
 
         return new DefaultAccountEmail(id, accountId, email);
     }

diff --git a/account/src/main/java/com/ning/billing/account/dao/AccountHistoryBinder.java b/account/src/main/java/com/ning/billing/account/dao/AccountHistoryBinder.java
index be30dc6..be07b3b 100644
--- a/account/src/main/java/com/ning/billing/account/dao/AccountHistoryBinder.java
+++ b/account/src/main/java/com/ning/billing/account/dao/AccountHistoryBinder.java
@@ -16,20 +16,21 @@
 
 package com.ning.billing.account.dao;
 
-import com.ning.billing.account.api.Account;
-import com.ning.billing.catalog.api.Currency;
-import com.ning.billing.util.dao.EntityHistory;
+import java.lang.annotation.Annotation;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
 import org.joda.time.DateTimeZone;
 import org.skife.jdbi.v2.SQLStatement;
 import org.skife.jdbi.v2.sqlobject.Binder;
 import org.skife.jdbi.v2.sqlobject.BinderFactory;
 import org.skife.jdbi.v2.sqlobject.BindingAnnotation;
 
-import java.lang.annotation.Annotation;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import com.ning.billing.account.api.Account;
+import com.ning.billing.catalog.api.Currency;
+import com.ning.billing.util.dao.EntityHistory;
 
 @BindingAnnotation(AccountHistoryBinder.AccountHistoryBinderFactory.class)
 @Retention(RetentionPolicy.RUNTIME)
@@ -37,24 +38,24 @@ import java.lang.annotation.Target;
 public @interface AccountHistoryBinder {
     public static class AccountHistoryBinderFactory implements BinderFactory {
         @Override
-        public Binder<AccountHistoryBinder, EntityHistory<Account>> build(Annotation annotation) {
+        public Binder<AccountHistoryBinder, EntityHistory<Account>> build(final Annotation annotation) {
             return new Binder<AccountHistoryBinder, EntityHistory<Account>>() {
                 @Override
-                public void bind(SQLStatement q, AccountHistoryBinder bind, EntityHistory<Account> history) {
+                public void bind(final SQLStatement q, final AccountHistoryBinder bind, final EntityHistory<Account> history) {
                     q.bind("recordId", history.getValue());
                     q.bind("changeType", history.getChangeType().toString());
 
-                    Account account = history.getEntity();
+                    final Account account = history.getEntity();
                     q.bind("id", account.getId().toString());
                     q.bind("externalKey", account.getExternalKey());
                     q.bind("email", account.getEmail());
                     q.bind("name", account.getName());
                     q.bind("firstNameLength", account.getFirstNameLength());
-                    Currency currency = account.getCurrency();
+                    final Currency currency = account.getCurrency();
                     q.bind("currency", (currency == null) ? null : currency.toString());
                     q.bind("billingCycleDay", account.getBillCycleDay());
-                    q.bind("paymentMethodId", account.getPaymentMethodId() !=  null ? account.getPaymentMethodId().toString() : null);
-                    DateTimeZone timeZone = account.getTimeZone();
+                    q.bind("paymentMethodId", account.getPaymentMethodId() != null ? account.getPaymentMethodId().toString() : null);
+                    final DateTimeZone timeZone = account.getTimeZone();
                     q.bind("timeZone", (timeZone == null) ? null : timeZone.toString());
                     q.bind("locale", account.getLocale());
                     q.bind("address1", account.getAddress1());

diff --git a/account/src/main/java/com/ning/billing/account/dao/AccountMapper.java b/account/src/main/java/com/ning/billing/account/dao/AccountMapper.java
index 9fd3943..f443993 100644
--- a/account/src/main/java/com/ning/billing/account/dao/AccountMapper.java
+++ b/account/src/main/java/com/ning/billing/account/dao/AccountMapper.java
@@ -16,17 +16,18 @@
 
 package com.ning.billing.account.dao;
 
-import com.ning.billing.account.api.Account;
-import com.ning.billing.account.api.DefaultAccount;
-import com.ning.billing.catalog.api.Currency;
-import com.ning.billing.util.dao.MapperBase;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.UUID;
+
 import org.joda.time.DateTimeZone;
 import org.skife.jdbi.v2.StatementContext;
 import org.skife.jdbi.v2.tweak.ResultSetMapper;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.UUID;
+import com.ning.billing.account.api.Account;
+import com.ning.billing.account.api.DefaultAccount;
+import com.ning.billing.catalog.api.Currency;
+import com.ning.billing.util.dao.MapperBase;
 
 public class AccountMapper extends MapperBase implements ResultSetMapper<Account> {
     @Override
@@ -60,9 +61,9 @@ public class AccountMapper extends MapperBase implements ResultSetMapper<Account
         final Boolean isMigrated = result.getBoolean("migrated");
         final Boolean isNotifiedForInvoices = result.getBoolean("is_notified_for_invoices");
 
-        return new DefaultAccount(id, externalKey, email, name,firstNameLength, currency,
-                billingCycleDay, paymentMethodId, timeZone, locale,
-                address1, address2, companyName, city, stateOrProvince, country, postalCode, phone,
-                isMigrated, isNotifiedForInvoices);
+        return new DefaultAccount(id, externalKey, email, name, firstNameLength, currency,
+                                  billingCycleDay, paymentMethodId, timeZone, locale,
+                                  address1, address2, companyName, city, stateOrProvince, country, postalCode, phone,
+                                  isMigrated, isNotifiedForInvoices);
     }
 }

diff --git a/account/src/main/java/com/ning/billing/account/dao/AccountSqlDao.java b/account/src/main/java/com/ning/billing/account/dao/AccountSqlDao.java
index 8ed05ee..01b344a 100644
--- a/account/src/main/java/com/ning/billing/account/dao/AccountSqlDao.java
+++ b/account/src/main/java/com/ning/billing/account/dao/AccountSqlDao.java
@@ -18,15 +18,6 @@ package com.ning.billing.account.dao;
 
 import java.util.UUID;
 
-import com.ning.billing.account.api.Account;
-import com.ning.billing.util.ChangeType;
-import com.ning.billing.util.dao.AuditSqlDao;
-import com.ning.billing.util.callcontext.CallContext;
-import com.ning.billing.util.callcontext.CallContextBinder;
-import com.ning.billing.util.dao.ChangeTypeBinder;
-import com.ning.billing.util.dao.EntityHistory;
-import com.ning.billing.util.dao.UuidMapper;
-import com.ning.billing.util.entity.dao.UpdatableEntitySqlDao;
 import org.skife.jdbi.v2.sqlobject.Bind;
 import org.skife.jdbi.v2.sqlobject.SqlQuery;
 import org.skife.jdbi.v2.sqlobject.SqlUpdate;
@@ -35,6 +26,13 @@ import org.skife.jdbi.v2.sqlobject.mixins.Transactional;
 import org.skife.jdbi.v2.sqlobject.mixins.Transmogrifier;
 import org.skife.jdbi.v2.sqlobject.stringtemplate.ExternalizedSqlViaStringTemplate3;
 
+import com.ning.billing.account.api.Account;
+import com.ning.billing.util.callcontext.CallContext;
+import com.ning.billing.util.callcontext.CallContextBinder;
+import com.ning.billing.util.dao.EntityHistory;
+import com.ning.billing.util.dao.UuidMapper;
+import com.ning.billing.util.entity.dao.UpdatableEntitySqlDao;
+
 @ExternalizedSqlViaStringTemplate3
 @RegisterMapper({UuidMapper.class, AccountMapper.class})
 public interface AccountSqlDao extends UpdatableEntitySqlDao<Account>, Transactional<AccountSqlDao>, Transmogrifier {
@@ -55,5 +53,5 @@ public interface AccountSqlDao extends UpdatableEntitySqlDao<Account>, Transacti
     @Override
     @SqlUpdate
     public void insertHistoryFromTransaction(@AccountHistoryBinder final EntityHistory<Account> account,
-                                            @CallContextBinder final CallContext context);
+                                             @CallContextBinder final CallContext context);
 }

diff --git a/account/src/main/java/com/ning/billing/account/dao/AuditedAccountDao.java b/account/src/main/java/com/ning/billing/account/dao/AuditedAccountDao.java
index ae4d623..8d4dca4 100644
--- a/account/src/main/java/com/ning/billing/account/dao/AuditedAccountDao.java
+++ b/account/src/main/java/com/ning/billing/account/dao/AuditedAccountDao.java
@@ -34,9 +34,9 @@ import com.ning.billing.account.api.AccountChangeEvent;
 import com.ning.billing.account.api.AccountCreationEvent;
 import com.ning.billing.account.api.user.DefaultAccountChangeEvent;
 import com.ning.billing.account.api.user.DefaultAccountCreationEvent;
+import com.ning.billing.util.ChangeType;
 import com.ning.billing.util.bus.Bus;
 import com.ning.billing.util.bus.Bus.EventBusException;
-import com.ning.billing.util.ChangeType;
 import com.ning.billing.util.callcontext.CallContext;
 import com.ning.billing.util.dao.EntityAudit;
 import com.ning.billing.util.dao.EntityHistory;
@@ -44,13 +44,13 @@ import com.ning.billing.util.dao.TableName;
 import com.ning.billing.util.entity.EntityPersistenceException;
 
 public class AuditedAccountDao implements AccountDao {
-    private final static Logger log = LoggerFactory.getLogger(AuditedAccountDao.class);
-    
+    private static final Logger log = LoggerFactory.getLogger(AuditedAccountDao.class);
+
     private final AccountSqlDao accountSqlDao;
     private final Bus eventBus;
 
     @Inject
-    public AuditedAccountDao(IDBI dbi, Bus eventBus) {
+    public AuditedAccountDao(final IDBI dbi, final Bus eventBus) {
         this.eventBus = eventBus;
         this.accountSqlDao = dbi.onDemand(AccountSqlDao.class);
     }
@@ -85,23 +85,23 @@ public class AuditedAccountDao implements AccountDao {
             accountSqlDao.inTransaction(new Transaction<Void, AccountSqlDao>() {
                 @Override
                 public Void inTransaction(final AccountSqlDao transactionalDao, final TransactionStatus status) throws AccountApiException, Bus.EventBusException {
-                    Account currentAccount = transactionalDao.getAccountByKey(key);
+                    final Account currentAccount = transactionalDao.getAccountByKey(key);
                     if (currentAccount != null) {
                         throw new AccountApiException(ErrorCode.ACCOUNT_ALREADY_EXISTS, key);
                     }
                     transactionalDao.create(account, context);
 
                     // insert history
-                    Long recordId = accountSqlDao.getRecordId(account.getId().toString());
-                    EntityHistory<Account> history = new EntityHistory<Account>(account.getId(), recordId, account, ChangeType.INSERT);
+                    final Long recordId = accountSqlDao.getRecordId(account.getId().toString());
+                    final EntityHistory<Account> history = new EntityHistory<Account>(account.getId(), recordId, account, ChangeType.INSERT);
                     accountSqlDao.insertHistoryFromTransaction(history, context);
 
                     // insert audit
-                    Long historyRecordId = accountSqlDao.getHistoryRecordId(recordId);
-                    EntityAudit audit = new EntityAudit(TableName.ACCOUNT_HISTORY, historyRecordId, ChangeType.INSERT);
+                    final Long historyRecordId = accountSqlDao.getHistoryRecordId(recordId);
+                    final EntityAudit audit = new EntityAudit(TableName.ACCOUNT_HISTORY, historyRecordId, ChangeType.INSERT);
                     accountSqlDao.insertAuditFromTransaction(audit, context);
 
-                    AccountCreationEvent creationEvent = new DefaultAccountCreationEvent(account, context.getUserToken());
+                    final AccountCreationEvent creationEvent = new DefaultAccountCreationEvent(account, context.getUserToken());
                     try {
                         eventBus.postFromTransaction(creationEvent, transactionalDao);
                     } catch (EventBusException e) {
@@ -127,28 +127,28 @@ public class AuditedAccountDao implements AccountDao {
             accountSqlDao.inTransaction(new Transaction<Void, AccountSqlDao>() {
                 @Override
                 public Void inTransaction(final AccountSqlDao transactional, final TransactionStatus status) throws EntityPersistenceException, Bus.EventBusException {
-                    String accountId = account.getId().toString();
-                    Account currentAccount = transactional.getById(accountId);
+                    final String accountId = account.getId().toString();
+                    final Account currentAccount = transactional.getById(accountId);
                     if (currentAccount == null) {
                         throw new EntityPersistenceException(ErrorCode.ACCOUNT_DOES_NOT_EXIST_FOR_ID, accountId);
                     }
 
-                    String currentKey = currentAccount.getExternalKey();
+                    final String currentKey = currentAccount.getExternalKey();
                     if (!currentKey.equals(account.getExternalKey())) {
                         throw new EntityPersistenceException(ErrorCode.ACCOUNT_CANNOT_CHANGE_EXTERNAL_KEY, currentKey);
                     }
 
                     transactional.update(account, context);
 
-                    Long recordId = accountSqlDao.getRecordId(account.getId().toString());
-                    EntityHistory<Account> history = new EntityHistory<Account>(account.getId(), recordId, account, ChangeType.INSERT);
+                    final Long recordId = accountSqlDao.getRecordId(account.getId().toString());
+                    final EntityHistory<Account> history = new EntityHistory<Account>(account.getId(), recordId, account, ChangeType.INSERT);
                     accountSqlDao.insertHistoryFromTransaction(history, context);
 
-                    Long historyRecordId = accountSqlDao.getHistoryRecordId(recordId);
-                    EntityAudit audit = new EntityAudit(TableName.ACCOUNT_HISTORY, historyRecordId, ChangeType.INSERT);
+                    final Long historyRecordId = accountSqlDao.getHistoryRecordId(recordId);
+                    final EntityAudit audit = new EntityAudit(TableName.ACCOUNT_HISTORY, historyRecordId, ChangeType.INSERT);
                     accountSqlDao.insertAuditFromTransaction(audit, context);
 
-                    AccountChangeEvent changeEvent = new DefaultAccountChangeEvent(account.getId(), context.getUserToken(), currentAccount, account);
+                    final AccountChangeEvent changeEvent = new DefaultAccountChangeEvent(account.getId(), context.getUserToken(), currentAccount, account);
                     if (changeEvent.hasChanges()) {
                         try {
                             eventBus.postFromTransaction(changeEvent, transactional);

diff --git a/account/src/test/java/com/ning/billing/account/api/user/TestEventJson.java b/account/src/test/java/com/ning/billing/account/api/user/TestEventJson.java
index a32fbc2..8853ad6 100644
--- a/account/src/test/java/com/ning/billing/account/api/user/TestEventJson.java
+++ b/account/src/test/java/com/ning/billing/account/api/user/TestEventJson.java
@@ -19,7 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
-import com.ning.billing.util.jackson.ObjectMapper;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -27,36 +26,37 @@ import com.ning.billing.account.api.AccountChangeEvent;
 import com.ning.billing.account.api.ChangedField;
 import com.ning.billing.account.api.DefaultChangedField;
 import com.ning.billing.account.api.user.DefaultAccountCreationEvent.DefaultAccountData;
+import com.ning.billing.util.jackson.ObjectMapper;
 
 public class TestEventJson {
     private final ObjectMapper mapper = new ObjectMapper();
 
-    @Test(groups= {"fast"})
+    @Test(groups = {"fast"})
     public void testDefaultAccountChangeEvent() throws Exception {
 
-        List<ChangedField> changes = new ArrayList<ChangedField>();
+        final List<ChangedField> changes = new ArrayList<ChangedField>();
         changes.add(new DefaultChangedField("fieldXX", "valueX", "valueXXX"));
-        changes.add(new DefaultChangedField("fieldYY", "valueY", "valueYYY"));        
-        AccountChangeEvent e = new DefaultAccountChangeEvent(UUID.randomUUID(), changes, UUID.randomUUID());
-        
-        String json = mapper.writeValueAsString(e);
-        
-        Class<?> claz = Class.forName("com.ning.billing.account.api.user.DefaultAccountChangeEvent");
-        Object obj =  mapper.readValue(json, claz);
+        changes.add(new DefaultChangedField("fieldYY", "valueY", "valueYYY"));
+        final AccountChangeEvent e = new DefaultAccountChangeEvent(UUID.randomUUID(), changes, UUID.randomUUID());
+
+        final String json = mapper.writeValueAsString(e);
+
+        final Class<?> claz = Class.forName("com.ning.billing.account.api.user.DefaultAccountChangeEvent");
+        final Object obj = mapper.readValue(json, claz);
         Assert.assertTrue(obj.equals(e));
     }
-    
-    @Test(groups= {"fast"})
+
+    @Test(groups = {"fast"})
     public void testAccountCreationEvent() throws Exception {
-        
-        DefaultAccountData data = new DefaultAccountData("dsfdsf", "bobo", 3, "bobo@yahoo.com", 12, "USD", UUID.randomUUID(), 
-                "UTC", "US", "21 avenue", "", "Gling", "San Franciso", "CA", "94110", "USA", "4126789887", false, false);
-        DefaultAccountCreationEvent e = new DefaultAccountCreationEvent(data, UUID.randomUUID(), UUID.randomUUID());
-        
-        String json = mapper.writeValueAsString(e);
-        Class<?> claz = Class.forName(DefaultAccountCreationEvent.class.getName());
-        Object obj =  mapper.readValue(json, claz);
+
+        final DefaultAccountData data = new DefaultAccountData("dsfdsf", "bobo", 3, "bobo@yahoo.com", 12, "USD", UUID.randomUUID(),
+                                                         "UTC", "US", "21 avenue", "", "Gling", "San Franciso", "CA", "94110", "USA", "4126789887", false, false);
+        final DefaultAccountCreationEvent e = new DefaultAccountCreationEvent(data, UUID.randomUUID(), UUID.randomUUID());
+
+        final String json = mapper.writeValueAsString(e);
+        final Class<?> claz = Class.forName(DefaultAccountCreationEvent.class.getName());
+        final Object obj = mapper.readValue(json, claz);
         Assert.assertTrue(obj.equals(e));
-        
+
     }
 }

diff --git a/account/src/test/java/com/ning/billing/account/dao/AccountDaoTestBase.java b/account/src/test/java/com/ning/billing/account/dao/AccountDaoTestBase.java
index a97a630..1d51373 100644
--- a/account/src/test/java/com/ning/billing/account/dao/AccountDaoTestBase.java
+++ b/account/src/test/java/com/ning/billing/account/dao/AccountDaoTestBase.java
@@ -16,8 +16,6 @@
 
 package com.ning.billing.account.dao;
 
-import static org.testng.Assert.fail;
-
 import java.io.IOException;
 
 import org.apache.commons.io.IOUtils;
@@ -30,18 +28,20 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 
 import com.ning.billing.dbi.MysqlTestingHelper;
-import com.ning.billing.util.bus.DefaultBusService;
-import com.ning.billing.util.bus.BusService;
 import com.ning.billing.util.bus.Bus;
+import com.ning.billing.util.bus.BusService;
+import com.ning.billing.util.bus.DefaultBusService;
 import com.ning.billing.util.bus.InMemoryBus;
 import com.ning.billing.util.callcontext.CallContext;
 import com.ning.billing.util.callcontext.CallOrigin;
-import com.ning.billing.util.callcontext.UserType;
 import com.ning.billing.util.callcontext.DefaultCallContextFactory;
+import com.ning.billing.util.callcontext.UserType;
 import com.ning.billing.util.clock.Clock;
 import com.ning.billing.util.clock.ClockMock;
 import com.ning.billing.util.tag.api.user.TagEventBuilder;
 
+import static org.testng.Assert.fail;
+
 public abstract class AccountDaoTestBase {
     private final MysqlTestingHelper helper = new MysqlTestingHelper();
 
@@ -67,7 +67,7 @@ public abstract class AccountDaoTestBase {
             dbi = helper.getDBI();
 
             bus = new InMemoryBus();
-            BusService busService = new DefaultBusService(bus);
+            final BusService busService = new DefaultBusService(bus);
             ((DefaultBusService) busService).startBus();
 
             accountDao = new AuditedAccountDao(dbi, bus);
@@ -76,17 +76,15 @@ public abstract class AccountDaoTestBase {
             accountEmailDao = new AuditedAccountEmailDao(dbi);
             accountEmailDao.test();
 
-            Clock clock = new ClockMock();
+            final Clock clock = new ClockMock();
             context = new DefaultCallContextFactory(clock).createCallContext("Account Dao Tests", CallOrigin.TEST, UserType.TEST);
-        }
-        catch (Throwable t) {
+        } catch (Throwable t) {
             fail(t.toString());
         }
     }
 
     @AfterClass(alwaysRun = true)
-    public void stopMysql()
-    {
+    public void stopMysql() {
         helper.stopMysql();
     }
 
@@ -94,11 +92,11 @@ public abstract class AccountDaoTestBase {
     public void cleanupData() {
         dbi.inTransaction(new TransactionCallback<Void>() {
             @Override
-            public Void inTransaction(Handle h, TransactionStatus status) throws Exception {
+            public Void inTransaction(final Handle h, final TransactionStatus status) throws Exception {
                 h.execute("truncate table accounts");
                 h.execute("truncate table notifications");
                 h.execute("truncate table bus_events");
-                h.execute("truncate table claimed_bus_events");                              
+                h.execute("truncate table claimed_bus_events");
                 h.execute("truncate table claimed_notifications");
                 h.execute("truncate table tag_definitions");
                 h.execute("truncate table tags");

diff --git a/account/src/test/java/com/ning/billing/account/dao/MockAccountDao.java b/account/src/test/java/com/ning/billing/account/dao/MockAccountDao.java
index d8348af..535dbbc 100644
--- a/account/src/test/java/com/ning/billing/account/dao/MockAccountDao.java
+++ b/account/src/test/java/com/ning/billing/account/dao/MockAccountDao.java
@@ -27,33 +27,32 @@ import com.ning.billing.account.api.Account;
 import com.ning.billing.account.api.AccountChangeEvent;
 import com.ning.billing.account.api.user.DefaultAccountChangeEvent;
 import com.ning.billing.account.api.user.DefaultAccountCreationEvent;
-import com.ning.billing.util.callcontext.CallContext;
 import com.ning.billing.util.bus.Bus;
 import com.ning.billing.util.bus.Bus.EventBusException;
+import com.ning.billing.util.callcontext.CallContext;
 
 public class MockAccountDao implements AccountDao {
     private final Bus eventBus;
     private final Map<UUID, Account> accounts = new ConcurrentHashMap<UUID, Account>();
 
     @Inject
-    public MockAccountDao(Bus eventBus) {
+    public MockAccountDao(final Bus eventBus) {
         this.eventBus = eventBus;
     }
 
     @Override
-    public void create(Account account, CallContext context) {
+    public void create(final Account account, final CallContext context) {
         accounts.put(account.getId(), account);
 
         try {
             eventBus.post(new DefaultAccountCreationEvent(account, null));
-        }
-        catch (EventBusException ex) {
+        } catch (EventBusException ex) {
             throw new RuntimeException(ex);
         }
     }
 
     @Override
-    public Account getById(UUID id) {
+    public Account getById(final UUID id) {
         return accounts.get(id);
     }
 
@@ -67,8 +66,8 @@ public class MockAccountDao implements AccountDao {
     }
 
     @Override
-    public Account getAccountByKey(String externalKey) {
-        for (Account account : accounts.values()) {
+    public Account getAccountByKey(final String externalKey) {
+        for (final Account account : accounts.values()) {
             if (externalKey.equals(account.getExternalKey())) {
                 return account;
             }
@@ -77,21 +76,20 @@ public class MockAccountDao implements AccountDao {
     }
 
     @Override
-    public UUID getIdFromKey(String externalKey) {
-        Account account = getAccountByKey(externalKey);
+    public UUID getIdFromKey(final String externalKey) {
+        final Account account = getAccountByKey(externalKey);
         return account == null ? null : account.getId();
     }
 
     @Override
-    public void update(Account account, CallContext context) {
-        Account currentAccount = accounts.put(account.getId(), account);
+    public void update(final Account account, final CallContext context) {
+        final Account currentAccount = accounts.put(account.getId(), account);
 
-        AccountChangeEvent changeEvent = new DefaultAccountChangeEvent(account.getId(), null, currentAccount, account);
+        final AccountChangeEvent changeEvent = new DefaultAccountChangeEvent(account.getId(), null, currentAccount, account);
         if (changeEvent.hasChanges()) {
             try {
                 eventBus.post(changeEvent);
-            }
-            catch (EventBusException ex) {
+            } catch (EventBusException ex) {
                 throw new RuntimeException(ex);
             }
         }

diff --git a/account/src/test/java/com/ning/billing/account/glue/AccountModuleWithMocks.java b/account/src/test/java/com/ning/billing/account/glue/AccountModuleWithMocks.java
index aa944e3..f806309 100644
--- a/account/src/test/java/com/ning/billing/account/glue/AccountModuleWithMocks.java
+++ b/account/src/test/java/com/ning/billing/account/glue/AccountModuleWithMocks.java
@@ -27,7 +27,7 @@ public class AccountModuleWithMocks extends AccountModule {
     @Override
     protected void installAccountDao() {
         bind(MockAccountDao.class).asEagerSingleton();
-        AccountEmailDao accountEmailDao = BrainDeadProxyFactory.createBrainDeadProxyFor(AccountEmailDao.class);
+        final AccountEmailDao accountEmailDao = BrainDeadProxyFactory.createBrainDeadProxyFor(AccountEmailDao.class);
         bind(AccountEmailDao.class).toInstance(accountEmailDao);
         bind(AccountDao.class).to(MockAccountDao.class);
     }

diff --git a/analytics/pom.xml b/analytics/pom.xml
index ee4897b..cfe4c80 100644
--- a/analytics/pom.xml
+++ b/analytics/pom.xml
@@ -8,7 +8,8 @@
     OR CONDITIONS OF ANY KIND, either express or implied. See the ~ License for 
     the specific language governing permissions and limitations ~ under the License. -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.ning.billing</groupId>
@@ -82,7 +83,7 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
-         <dependency>
+        <dependency>
             <groupId>com.ning.billing</groupId>
             <artifactId>killbill-catalog</artifactId>
             <scope>test</scope>
@@ -95,7 +96,7 @@
         <dependency>
             <groupId>com.ning.billing</groupId>
             <artifactId>killbill-entitlement</artifactId>
-             <type>test-jar</type>
+            <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -106,7 +107,7 @@
         <dependency>
             <groupId>com.ning.billing</groupId>
             <artifactId>killbill-junction</artifactId>
-             <type>test-jar</type>
+            <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/analytics/src/main/java/com/ning/billing/analytics/BusinessAccountRecorder.java b/analytics/src/main/java/com/ning/billing/analytics/BusinessAccountRecorder.java
index fb3343e..0877ae4 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/BusinessAccountRecorder.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/BusinessAccountRecorder.java
@@ -64,10 +64,10 @@ public class BusinessAccountRecorder {
     }
 
     public void accountCreated(final AccountData data) {
-        Account account;
+        final Account account;
         try {
             account = accountApi.getAccountByKey(data.getExternalKey());
-            Map<String, Tag> tags = tagUserApi.getTags(account.getId(), ObjectType.ACCOUNT);
+            final Map<String, Tag> tags = tagUserApi.getTags(account.getId(), ObjectType.ACCOUNT);
             final BusinessAccount bac = createBusinessAccountFromAccount(account, new ArrayList<Tag>(tags.values()));
 
             log.info("ACCOUNT CREATION " + bac);
@@ -177,11 +177,11 @@ public class BusinessAccountRecorder {
 
                 // Retrieve payments information for these invoices
                 DateTime lastPaymentDate = null;
-                
-                List<Payment> payments = paymentApi.getAccountPayments(account.getId());
+
+                final List<Payment> payments = paymentApi.getAccountPayments(account.getId());
                 if (payments != null) {
-                    for (Payment cur : payments) {
-                     // Use the last payment method/type/country as the default one for the account
+                    for (final Payment cur : payments) {
+                        // Use the last payment method/type/country as the default one for the account
                         if (lastPaymentDate == null || cur.getEffectiveDate().isAfter(lastPaymentDate)) {
                             lastPaymentDate = cur.getEffectiveDate();
                             lastPaymentStatus = cur.getPaymentStatus().toString();

diff --git a/analytics/src/main/java/com/ning/billing/analytics/BusinessSubscription.java b/analytics/src/main/java/com/ning/billing/analytics/BusinessSubscription.java
index c2b3205..8018b8b 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/BusinessSubscription.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/BusinessSubscription.java
@@ -90,11 +90,11 @@ public class BusinessSubscription {
      * @param currency     ACCOUNT currency
      * @param catalog      Catalog to use
      */
-    BusinessSubscription(final Subscription subscription, final Currency currency, Catalog catalog) {
+    BusinessSubscription(final Subscription subscription, final Currency currency, final Catalog catalog) {
         this(subscription.getCurrentPriceList() == null ? null : subscription.getCurrentPriceList().getName(), subscription.getCurrentPlan().getName(), subscription.getCurrentPhase().getName(), currency, subscription.getStartDate(), subscription.getState(), subscription.getId(), subscription.getBundleId(), catalog);
     }
 
-    public BusinessSubscription(final String priceList, final String currentPlan, final String currentPhase, final Currency currency, final DateTime startDate, final SubscriptionState state, final UUID subscriptionId, final UUID bundleId, Catalog catalog) {
+    public BusinessSubscription(final String priceList, final String currentPlan, final String currentPhase, final Currency currency, final DateTime startDate, final SubscriptionState state, final UUID subscriptionId, final UUID bundleId, final Catalog catalog) {
         Plan thePlan = null;
         PlanPhase thePhase = null;
         try {

diff --git a/analytics/src/main/java/com/ning/billing/analytics/BusinessSubscriptionEvent.java b/analytics/src/main/java/com/ning/billing/analytics/BusinessSubscriptionEvent.java
index 6c2a5c1..f3505b4 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/BusinessSubscriptionEvent.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/BusinessSubscriptionEvent.java
@@ -81,23 +81,23 @@ public class BusinessSubscriptionEvent {
         return eventType;
     }
 
-    public static BusinessSubscriptionEvent subscriptionCreated(final String plan, Catalog catalog, DateTime eventTime, DateTime subscriptionCreationDate) {
+    public static BusinessSubscriptionEvent subscriptionCreated(final String plan, final Catalog catalog, final DateTime eventTime, final DateTime subscriptionCreationDate) {
         return eventFromType(EventType.ADD, plan, catalog, eventTime, subscriptionCreationDate);
     }
 
-    public static BusinessSubscriptionEvent subscriptionCancelled(final String plan, Catalog catalog, DateTime eventTime, DateTime subscriptionCreationDate) {
+    public static BusinessSubscriptionEvent subscriptionCancelled(final String plan, final Catalog catalog, final DateTime eventTime, final DateTime subscriptionCreationDate) {
         return eventFromType(EventType.CANCEL, plan, catalog, eventTime, subscriptionCreationDate);
     }
 
-    public static BusinessSubscriptionEvent subscriptionChanged(final String plan, Catalog catalog, DateTime eventTime, DateTime subscriptionCreationDate) {
+    public static BusinessSubscriptionEvent subscriptionChanged(final String plan, final Catalog catalog, final DateTime eventTime, final DateTime subscriptionCreationDate) {
         return eventFromType(EventType.CHANGE, plan, catalog, eventTime, subscriptionCreationDate);
     }
 
-    public static BusinessSubscriptionEvent subscriptionRecreated(final String plan, Catalog catalog, DateTime eventTime, DateTime subscriptionCreationDate) {
+    public static BusinessSubscriptionEvent subscriptionRecreated(final String plan, final Catalog catalog, final DateTime eventTime, final DateTime subscriptionCreationDate) {
         return eventFromType(EventType.RE_ADD, plan, catalog, eventTime, subscriptionCreationDate);
     }
 
-    public static BusinessSubscriptionEvent subscriptionPhaseChanged(final String plan, final SubscriptionState state, Catalog catalog, DateTime eventTime, DateTime subscriptionCreationDate) {
+    public static BusinessSubscriptionEvent subscriptionPhaseChanged(final String plan, final SubscriptionState state, final Catalog catalog, final DateTime eventTime, final DateTime subscriptionCreationDate) {
         if (state != null && state.equals(SubscriptionState.CANCELLED)) {
             return eventFromType(EventType.SYSTEM_CANCEL, plan, catalog, eventTime, subscriptionCreationDate);
         } else {
@@ -105,7 +105,7 @@ public class BusinessSubscriptionEvent {
         }
     }
 
-    private static BusinessSubscriptionEvent eventFromType(final EventType eventType, final String plan, Catalog catalog, DateTime eventTime, DateTime subscriptionCreationDate) {
+    private static BusinessSubscriptionEvent eventFromType(final EventType eventType, final String plan, final Catalog catalog, final DateTime eventTime, final DateTime subscriptionCreationDate) {
         Plan thePlan = null;
         try {
             thePlan = catalog.findPlan(plan, eventTime, subscriptionCreationDate);
@@ -161,4 +161,4 @@ public class BusinessSubscriptionEvent {
         result = 31 * result + (category != null ? category.hashCode() : 0);
         return result;
     }
-}
\ No newline at end of file
+}

diff --git a/analytics/src/test/java/com/ning/billing/analytics/AnalyticsTestModule.java b/analytics/src/test/java/com/ning/billing/analytics/AnalyticsTestModule.java
index 3a76b0b..e7c167e 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/AnalyticsTestModule.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/AnalyticsTestModule.java
@@ -21,7 +21,6 @@ import org.skife.jdbi.v2.IDBI;
 
 import com.ning.billing.account.glue.AccountModule;
 import com.ning.billing.analytics.setup.AnalyticsModule;
-import com.ning.billing.catalog.MockCatalog;
 import com.ning.billing.catalog.api.Catalog;
 import com.ning.billing.catalog.api.CatalogService;
 import com.ning.billing.dbi.MysqlTestingHelper;

diff --git a/analytics/src/test/java/com/ning/billing/analytics/dao/MockBusinessAccountDao.java b/analytics/src/test/java/com/ning/billing/analytics/dao/MockBusinessAccountDao.java
index f3dead0..6fba2a7 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/dao/MockBusinessAccountDao.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/dao/MockBusinessAccountDao.java
@@ -21,19 +21,19 @@ import com.ning.billing.analytics.BusinessAccount;
 public class MockBusinessAccountDao implements BusinessAccountDao {
 
     @Override
-    public BusinessAccount getAccount(String key) {
+    public BusinessAccount getAccount(final String key) {
         // TODO Auto-generated method stub
         return null;
     }
 
     @Override
-    public int createAccount(BusinessAccount account) {
+    public int createAccount(final BusinessAccount account) {
         // TODO Auto-generated method stub
         return 0;
     }
 
     @Override
-    public int saveAccount(BusinessAccount account) {
+    public int saveAccount(final BusinessAccount account) {
         // TODO Auto-generated method stub
         return 0;
     }

diff --git a/analytics/src/test/java/com/ning/billing/analytics/MockAccountUserApi.java b/analytics/src/test/java/com/ning/billing/analytics/MockAccountUserApi.java
index 51f2ae8..d271737 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/MockAccountUserApi.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/MockAccountUserApi.java
@@ -66,17 +66,17 @@ public class MockAccountUserApi implements AccountUserApi {
     }
 
     @Override
-    public UUID getIdFromKey(String externalKey) {
+    public UUID getIdFromKey(final String externalKey) {
         return id;
     }
 
     @Override
-    public List<AccountEmail> getEmails(UUID accountId) {
+    public List<AccountEmail> getEmails(final UUID accountId) {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public void saveEmails(UUID accountId, List<AccountEmail> emails, CallContext context) {
+    public void saveEmails(final UUID accountId, final List<AccountEmail> emails, final CallContext context) {
         throw new UnsupportedOperationException();
     }
 
@@ -91,19 +91,19 @@ public class MockAccountUserApi implements AccountUserApi {
     }
 
     @Override
-    public Account migrateAccount(MigrationAccountData data, final CallContext context)
+    public Account migrateAccount(final MigrationAccountData data, final CallContext context)
             throws AccountApiException {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public void updateAccount(String key, AccountData accountData, final CallContext context)
+    public void updateAccount(final String key, final AccountData accountData, final CallContext context)
             throws AccountApiException {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public void updateAccount(UUID accountId, AccountData accountData, CallContext context)
+    public void updateAccount(final UUID accountId, final AccountData accountData, final CallContext context)
             throws AccountApiException {
         throw new NotImplementedException();
     }

diff --git a/analytics/src/test/java/com/ning/billing/analytics/MockDuration.java b/analytics/src/test/java/com/ning/billing/analytics/MockDuration.java
index 2bc723b..b39c93f 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/MockDuration.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/MockDuration.java
@@ -37,7 +37,7 @@ public class MockDuration {
             }
 
             @Override
-            public DateTime addToDateTime(DateTime dateTime) {
+            public DateTime addToDateTime(final DateTime dateTime) {
                 throw new NotImplementedException();
             }
 
@@ -61,7 +61,7 @@ public class MockDuration {
             }
 
             @Override
-            public DateTime addToDateTime(DateTime dateTime) {
+            public DateTime addToDateTime(final DateTime dateTime) {
                 throw new NotImplementedException();
             }
 
@@ -85,7 +85,7 @@ public class MockDuration {
             }
 
             @Override
-            public DateTime addToDateTime(DateTime dateTime) {
+            public DateTime addToDateTime(final DateTime dateTime) {
                 throw new NotImplementedException();
             }
 

diff --git a/analytics/src/test/java/com/ning/billing/analytics/MockEntitlementUserApi.java b/analytics/src/test/java/com/ning/billing/analytics/MockEntitlementUserApi.java
index 789edfc..aee16cb 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/MockEntitlementUserApi.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/MockEntitlementUserApi.java
@@ -96,39 +96,39 @@ public class MockEntitlementUserApi implements EntitlementUserApi {
     }
 
     @Override
-    public SubscriptionBundle createBundleForAccount(final UUID accountId, final String bundleKey, CallContext context) throws EntitlementUserApiException {
+    public SubscriptionBundle createBundleForAccount(final UUID accountId, final String bundleKey, final CallContext context) throws EntitlementUserApiException {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public List<Subscription> getSubscriptionsForKey(String bundleKey) {
+    public List<Subscription> getSubscriptionsForKey(final String bundleKey) {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public Subscription createSubscription(UUID bundleId, PlanPhaseSpecifier spec,
-                                           DateTime requestedDate, CallContext context) throws EntitlementUserApiException {
+    public Subscription createSubscription(final UUID bundleId, final PlanPhaseSpecifier spec,
+                                           final DateTime requestedDate, final CallContext context) throws EntitlementUserApiException {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public SubscriptionBundle getBundleForKey(String bundleKey) {
+    public SubscriptionBundle getBundleForKey(final String bundleKey) {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public DateTime getNextBillingDate(UUID account) {
+    public DateTime getNextBillingDate(final UUID account) {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public Subscription getBaseSubscription(UUID bundleId) {
+    public Subscription getBaseSubscription(final UUID bundleId) {
         throw new UnsupportedOperationException();
     }
 
     @Override
     public List<SubscriptionStatusDryRun> getDryRunChangePlanStatus(
-            UUID subscriptionId, String productName, DateTime requestedDate)
+            final UUID subscriptionId, final String productName, final DateTime requestedDate)
             throws EntitlementUserApiException {
         throw new UnsupportedOperationException();
     }

diff --git a/analytics/src/test/java/com/ning/billing/analytics/MockPlan.java b/analytics/src/test/java/com/ning/billing/analytics/MockPlan.java
index 49dc993..3bb28c2 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/MockPlan.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/MockPlan.java
@@ -82,7 +82,7 @@ public class MockPlan implements Plan {
     }
 
     @Override
-    public PlanPhase findPhase(String name) throws CatalogApiException {
+    public PlanPhase findPhase(final String name) throws CatalogApiException {
         throw new UnsupportedOperationException();
     }
 
@@ -93,7 +93,7 @@ public class MockPlan implements Plan {
 
     @Override
     public DateTime dateOfFirstRecurringNonZeroCharge(
-            DateTime subscriptionStartDate) {
+            final DateTime subscriptionStartDate) {
         throw new UnsupportedOperationException();
     }
 }

diff --git a/analytics/src/test/java/com/ning/billing/analytics/MockSubscription.java b/analytics/src/test/java/com/ning/billing/analytics/MockSubscription.java
index 385599f..c6dc330 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/MockSubscription.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/MockSubscription.java
@@ -50,12 +50,12 @@ public class MockSubscription implements Subscription {
     }
 
     @Override
-    public boolean cancel(DateTime requestedDate, boolean eot, CallContext context) {
+    public boolean cancel(final DateTime requestedDate, final boolean eot, final CallContext context) {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public boolean changePlan(final String productName, final BillingPeriod term, final String planSet, DateTime requestedDate, CallContext context) {
+    public boolean changePlan(final String productName, final BillingPeriod term, final String planSet, final DateTime requestedDate, final CallContext context) {
         throw new UnsupportedOperationException();
     }
 
@@ -91,7 +91,7 @@ public class MockSubscription implements Subscription {
 
 
     @Override
-    public boolean uncancel(CallContext context) throws EntitlementUserApiException {
+    public boolean uncancel(final CallContext context) throws EntitlementUserApiException {
         throw new UnsupportedOperationException();
     }
 
@@ -131,7 +131,7 @@ public class MockSubscription implements Subscription {
     }
 
     @Override
-    public boolean recreate(PlanPhaseSpecifier spec, DateTime requestedDate, CallContext context)
+    public boolean recreate(final PlanPhaseSpecifier spec, final DateTime requestedDate, final CallContext context)
             throws EntitlementUserApiException {
         throw new UnsupportedOperationException();
     }

diff --git a/api/pom.xml b/api/pom.xml
index 00e694d..4252e95 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -8,7 +8,8 @@
     OR CONDITIONS OF ANY KIND, either express or implied. See the ~ License for 
     the specific language governing permissions and limitations ~ under the License. -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.ning.billing</groupId>

diff --git a/api/src/main/java/com/ning/billing/account/api/Account.java b/api/src/main/java/com/ning/billing/account/api/Account.java
index f69af41..076afd7 100644
--- a/api/src/main/java/com/ning/billing/account/api/Account.java
+++ b/api/src/main/java/com/ning/billing/account/api/Account.java
@@ -20,5 +20,5 @@ import com.ning.billing.junction.api.Blockable;
 import com.ning.billing.util.entity.UpdatableEntity;
 
 public interface Account extends AccountData, UpdatableEntity, Blockable {
-    public MutableAccountData toMutableAccountData(); 
+    public MutableAccountData toMutableAccountData();
 }

diff --git a/api/src/main/java/com/ning/billing/account/api/AccountApiException.java b/api/src/main/java/com/ning/billing/account/api/AccountApiException.java
index a6b1460..a0d9061 100644
--- a/api/src/main/java/com/ning/billing/account/api/AccountApiException.java
+++ b/api/src/main/java/com/ning/billing/account/api/AccountApiException.java
@@ -20,17 +20,17 @@ import com.ning.billing.BillingExceptionBase;
 import com.ning.billing.ErrorCode;
 
 public class AccountApiException extends BillingExceptionBase {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	public AccountApiException(Throwable cause, int code, final String msg) {
+    public AccountApiException(final Throwable cause, final int code, final String msg) {
         super(cause, code, msg);
     }
 
-    public AccountApiException(Throwable cause, ErrorCode code, final Object... args) {
+    public AccountApiException(final Throwable cause, final ErrorCode code, final Object... args) {
         super(cause, code, args);
     }
 
-    public AccountApiException(ErrorCode code, final Object... args) {
+    public AccountApiException(final ErrorCode code, final Object... args) {
         super(code, args);
     }
 

diff --git a/api/src/main/java/com/ning/billing/account/api/AccountChangeEvent.java b/api/src/main/java/com/ning/billing/account/api/AccountChangeEvent.java
index 792d0ea..1c78280 100644
--- a/api/src/main/java/com/ning/billing/account/api/AccountChangeEvent.java
+++ b/api/src/main/java/com/ning/billing/account/api/AccountChangeEvent.java
@@ -16,11 +16,11 @@
 
 package com.ning.billing.account.api;
 
-import com.ning.billing.util.bus.BusEvent;
-
 import java.util.List;
 import java.util.UUID;
 
+import com.ning.billing.util.bus.BusEvent;
+
 public interface AccountChangeEvent extends BusEvent {
     public UUID getAccountId();
 

diff --git a/api/src/main/java/com/ning/billing/account/api/AccountCreationEvent.java b/api/src/main/java/com/ning/billing/account/api/AccountCreationEvent.java
index 983cbf1..3749e5a 100644
--- a/api/src/main/java/com/ning/billing/account/api/AccountCreationEvent.java
+++ b/api/src/main/java/com/ning/billing/account/api/AccountCreationEvent.java
@@ -16,12 +16,13 @@
 
 package com.ning.billing.account.api;
 
-import com.ning.billing.util.bus.BusEvent;
-
 import java.util.UUID;
 
+import com.ning.billing.util.bus.BusEvent;
+
 public interface AccountCreationEvent extends BusEvent {
-	
+
     public UUID getId();
+
     public AccountData getData();
 }

diff --git a/api/src/main/java/com/ning/billing/account/api/AccountEmail.java b/api/src/main/java/com/ning/billing/account/api/AccountEmail.java
index 88ec469..a1b535f 100644
--- a/api/src/main/java/com/ning/billing/account/api/AccountEmail.java
+++ b/api/src/main/java/com/ning/billing/account/api/AccountEmail.java
@@ -16,11 +16,12 @@
 
 package com.ning.billing.account.api;
 
-import com.ning.billing.util.entity.UpdatableEntity;
-
 import java.util.UUID;
 
+import com.ning.billing.util.entity.UpdatableEntity;
+
 public interface AccountEmail extends UpdatableEntity {
     UUID getAccountId();
+
     String getEmail();
 }

diff --git a/api/src/main/java/com/ning/billing/account/api/ChangedField.java b/api/src/main/java/com/ning/billing/account/api/ChangedField.java
index 8bf2ef1..5c7505b 100644
--- a/api/src/main/java/com/ning/billing/account/api/ChangedField.java
+++ b/api/src/main/java/com/ning/billing/account/api/ChangedField.java
@@ -20,7 +20,10 @@ import org.joda.time.DateTime;
 
 public interface ChangedField {
     public DateTime getChangeDate();
+
     public String getFieldName();
+
     public String getOldValue();
+
     public String getNewValue();
 }

diff --git a/api/src/main/java/com/ning/billing/account/api/DefaultMutableAccountData.java b/api/src/main/java/com/ning/billing/account/api/DefaultMutableAccountData.java
index 5ac7f50..be83546 100644
--- a/api/src/main/java/com/ning/billing/account/api/DefaultMutableAccountData.java
+++ b/api/src/main/java/com/ning/billing/account/api/DefaultMutableAccountData.java
@@ -43,14 +43,14 @@ public class DefaultMutableAccountData implements MutableAccountData {
     private String phone;
     private boolean isMigrated;
     private boolean isNotifiedForInvoices;
-    
-    public DefaultMutableAccountData(String externalKey, String email, String name,
-            int firstNameLength, Currency currency, int billCycleDay,
-            UUID paymentMethodId, TagStore tags, DateTimeZone timeZone,
-            String locale, String address1, String address2,
-            String companyName, String city, String stateOrProvince,
-            String country, String postalCode, String phone,
-            boolean isMigrated, boolean isNotifiedForInvoices) {
+
+    public DefaultMutableAccountData(final String externalKey, final String email, final String name,
+                                     final int firstNameLength, final Currency currency, final int billCycleDay,
+                                     final UUID paymentMethodId, final TagStore tags, final DateTimeZone timeZone,
+                                     final String locale, final String address1, final String address2,
+                                     final String companyName, final String city, final String stateOrProvince,
+                                     final String country, final String postalCode, final String phone,
+                                     final boolean isMigrated, final boolean isNotifiedForInvoices) {
         super();
         this.externalKey = externalKey;
         this.email = email;
@@ -72,8 +72,8 @@ public class DefaultMutableAccountData implements MutableAccountData {
         this.isMigrated = isMigrated;
         this.isNotifiedForInvoices = isNotifiedForInvoices;
     }
-    
-    public DefaultMutableAccountData(AccountData accountData) {
+
+    public DefaultMutableAccountData(final AccountData accountData) {
         super();
         this.externalKey = accountData.getExternalKey();
         this.email = accountData.getEmail();
@@ -103,259 +103,294 @@ public class DefaultMutableAccountData implements MutableAccountData {
     public String getExternalKey() {
         return externalKey;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#getEmail()
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#getEmail()
+    */
     @Override
     public String getEmail() {
         return email;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#getName()
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#getName()
+    */
     @Override
     public String getName() {
         return name;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#getFirstNameLength()
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#getFirstNameLength()
+    */
     @Override
     public int getFirstNameLength() {
         return firstNameLength;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#getCurrency()
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#getCurrency()
+    */
     @Override
     public Currency getCurrency() {
         return currency;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#getBillCycleDay()
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#getBillCycleDay()
+    */
     @Override
     public int getBillCycleDay() {
         return billCycleDay;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#getPaymentProviderName()
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#getPaymentProviderName()
+    */
     @Override
     public UUID getPaymentMethodId() {
         return paymentMethodId;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#getTimeZone()
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#getTimeZone()
+    */
     @Override
     public DateTimeZone getTimeZone() {
         return timeZone;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#getLocale()
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#getLocale()
+    */
     @Override
     public String getLocale() {
         return locale;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#getAddress1()
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#getAddress1()
+    */
     @Override
     public String getAddress1() {
         return address1;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#getAddress2()
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#getAddress2()
+    */
     @Override
     public String getAddress2() {
         return address2;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#getCompanyName()
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#getCompanyName()
+    */
     @Override
     public String getCompanyName() {
         return companyName;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#getCity()
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#getCity()
+    */
     @Override
     public String getCity() {
         return city;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#getStateOrProvince()
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#getStateOrProvince()
+    */
     @Override
     public String getStateOrProvince() {
         return stateOrProvince;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#getCountry()
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#getCountry()
+    */
     @Override
     public String getCountry() {
         return country;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#getPostalCode()
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#getPostalCode()
+    */
     @Override
     public String getPostalCode() {
         return postalCode;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#getPhone()
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#getPhone()
+    */
     @Override
     public String getPhone() {
         return phone;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#isMigrated()
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#isMigrated()
+    */
     @Override
     public boolean isMigrated() {
         return isMigrated;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#getSendInvoiceEmails()
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#getSendInvoiceEmails()
+    */
     @Override
     public boolean isNotifiedForInvoices() {
         return isNotifiedForInvoices;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#setExternalKey(java.lang.String)
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#setExternalKey(java.lang.String)
+    */
     @Override
-    public void setExternalKey(String externalKey) {
+    public void setExternalKey(final String externalKey) {
         this.externalKey = externalKey;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#setEmail(java.lang.String)
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#setEmail(java.lang.String)
+    */
     @Override
-    public void setEmail(String email) {
+    public void setEmail(final String email) {
         this.email = email;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#setName(java.lang.String)
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#setName(java.lang.String)
+    */
     @Override
-    public void setName(String name) {
+    public void setName(final String name) {
         this.name = name;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#setFirstNameLength(int)
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#setFirstNameLength(int)
+    */
     @Override
-    public void setFirstNameLength(int firstNameLength) {
+    public void setFirstNameLength(final int firstNameLength) {
         this.firstNameLength = firstNameLength;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#setCurrency(com.ning.billing.catalog.api.Currency)
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#setCurrency(com.ning.billing.catalog.api.Currency)
+    */
     @Override
-    public void setCurrency(Currency currency) {
+    public void setCurrency(final Currency currency) {
         this.currency = currency;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#setBillCycleDay(int)
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#setBillCycleDay(int)
+    */
     @Override
-    public void setBillCycleDay(int billCycleDay) {
+    public void setBillCycleDay(final int billCycleDay) {
         this.billCycleDay = billCycleDay;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#setPaymentProviderName(java.lang.String)
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#setPaymentProviderName(java.lang.String)
+    */
     @Override
-    public void setPaymentMethodId(UUID paymentMethodId) {
+    public void setPaymentMethodId(final UUID paymentMethodId) {
         this.paymentMethodId = paymentMethodId;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#setTimeZone(org.joda.time.DateTimeZone)
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#setTimeZone(org.joda.time.DateTimeZone)
+    */
     @Override
-    public void setTimeZone(DateTimeZone timeZone) {
+    public void setTimeZone(final DateTimeZone timeZone) {
         this.timeZone = timeZone;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#setLocale(java.lang.String)
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#setLocale(java.lang.String)
+    */
     @Override
-    public void setLocale(String locale) {
+    public void setLocale(final String locale) {
         this.locale = locale;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#setAddress1(java.lang.String)
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#setAddress1(java.lang.String)
+    */
     @Override
-    public void setAddress1(String address1) {
+    public void setAddress1(final String address1) {
         this.address1 = address1;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#setAddress2(java.lang.String)
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#setAddress2(java.lang.String)
+    */
     @Override
-    public void setAddress2(String address2) {
+    public void setAddress2(final String address2) {
         this.address2 = address2;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#setCompanyName(java.lang.String)
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#setCompanyName(java.lang.String)
+    */
     @Override
-    public void setCompanyName(String companyName) {
+    public void setCompanyName(final String companyName) {
         this.companyName = companyName;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#setCity(java.lang.String)
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#setCity(java.lang.String)
+    */
     @Override
-    public void setCity(String city) {
+    public void setCity(final String city) {
         this.city = city;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#setStateOrProvince(java.lang.String)
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#setStateOrProvince(java.lang.String)
+    */
     @Override
-    public void setStateOrProvince(String stateOrProvince) {
+    public void setStateOrProvince(final String stateOrProvince) {
         this.stateOrProvince = stateOrProvince;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#setCountry(java.lang.String)
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#setCountry(java.lang.String)
+    */
     @Override
-    public void setCountry(String country) {
+    public void setCountry(final String country) {
         this.country = country;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#setPostalCode(java.lang.String)
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#setPostalCode(java.lang.String)
+    */
     @Override
-    public void setPostalCode(String postalCode) {
+    public void setPostalCode(final String postalCode) {
         this.postalCode = postalCode;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.account.api.MutableAccountData#setPhone(java.lang.String)
-     */
+    * @see com.ning.billing.account.api.MutableAccountData#setPhone(java.lang.String)
+    */
     @Override
-    public void setPhone(String phone) {
+    public void setPhone(final String phone) {
         this.phone = phone;
     }
 
     @Override
-    public void setIsMigrated(boolean isMigrated) {
+    public void setIsMigrated(final boolean isMigrated) {
         this.isMigrated = isMigrated;
     }
 
     @Override
-    public void setIsNotifiedForInvoices(boolean isNotifiedForInvoices) {
+    public void setIsNotifiedForInvoices(final boolean isNotifiedForInvoices) {
         this.isNotifiedForInvoices = isNotifiedForInvoices;
     }
 

diff --git a/api/src/main/java/com/ning/billing/account/api/MigrationAccountData.java b/api/src/main/java/com/ning/billing/account/api/MigrationAccountData.java
index 34f7023..7b44ef8 100644
--- a/api/src/main/java/com/ning/billing/account/api/MigrationAccountData.java
+++ b/api/src/main/java/com/ning/billing/account/api/MigrationAccountData.java
@@ -20,7 +20,7 @@ import org.joda.time.DateTime;
 
 public interface MigrationAccountData extends AccountData {
 
-	public DateTime getCreatedDate();
-	
-	public DateTime getUpdatedDate();
+    public DateTime getCreatedDate();
+
+    public DateTime getUpdatedDate();
 }

diff --git a/api/src/main/java/com/ning/billing/BillingExceptionBase.java b/api/src/main/java/com/ning/billing/BillingExceptionBase.java
index a4ff3cd..a074d3e 100644
--- a/api/src/main/java/com/ning/billing/BillingExceptionBase.java
+++ b/api/src/main/java/com/ning/billing/BillingExceptionBase.java
@@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory;
 
 public class BillingExceptionBase extends Exception {
 
-    private final static Logger log = LoggerFactory.getLogger(BillingExceptionBase.class);
+    private static final Logger log = LoggerFactory.getLogger(BillingExceptionBase.class);
 
     private static final long serialVersionUID = 165720101383L;
 
@@ -30,23 +30,23 @@ public class BillingExceptionBase extends Exception {
     private final int code;
     private final String formattedMsg;
 
-    public BillingExceptionBase(Throwable cause, int code, final String msg) {
+    public BillingExceptionBase(final Throwable cause, final int code, final String msg) {
         this.formattedMsg = msg;
         this.code = code;
         this.cause = cause;
     }
-    
-    public BillingExceptionBase(BillingExceptionBase cause) {
+
+    public BillingExceptionBase(final BillingExceptionBase cause) {
         this.formattedMsg = cause.getMessage();
         this.code = cause.getCode();
         this.cause = cause;
     }
 
 
-    public BillingExceptionBase(Throwable cause, ErrorCode code, final Object... args) {
+    public BillingExceptionBase(final Throwable cause, final ErrorCode code, final Object... args) {
         String tmp = null;
         try {
-           tmp = String.format(code.getFormat(), args);
+            tmp = String.format(code.getFormat(), args);
         } catch (RuntimeException e) {
             log.error("Failed to format msg for error code " + code.getCode(), e);
             throw e;
@@ -56,7 +56,7 @@ public class BillingExceptionBase extends Exception {
         this.cause = cause;
     }
 
-    public BillingExceptionBase(ErrorCode code, final Object... args) {
+    public BillingExceptionBase(final ErrorCode code, final Object... args) {
         this(null, code, args);
     }
 

diff --git a/api/src/main/java/com/ning/billing/catalog/api/ActionPolicy.java b/api/src/main/java/com/ning/billing/catalog/api/ActionPolicy.java
index 4719d4d..831a3f2 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/ActionPolicy.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/ActionPolicy.java
@@ -17,7 +17,7 @@
 package com.ning.billing.catalog.api;
 
 public enum ActionPolicy {
-	END_OF_TERM, // transition occurs at end of term
-	IMMEDIATE,   // transition occurs immediately
-	ILLEGAL      // transition is not allowed
+    END_OF_TERM, // transition occurs at end of term
+    IMMEDIATE,   // transition occurs immediately
+    ILLEGAL      // transition is not allowed
 }

diff --git a/api/src/main/java/com/ning/billing/catalog/api/BillingAlignment.java b/api/src/main/java/com/ning/billing/catalog/api/BillingAlignment.java
index 5dce39d..a774936 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/BillingAlignment.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/BillingAlignment.java
@@ -17,7 +17,7 @@
 package com.ning.billing.catalog.api;
 
 public enum BillingAlignment {
-	ACCOUNT,
-	BUNDLE,
-	SUBSCRIPTION
+    ACCOUNT,
+    BUNDLE,
+    SUBSCRIPTION
 }

diff --git a/api/src/main/java/com/ning/billing/catalog/api/BillingPeriod.java b/api/src/main/java/com/ning/billing/catalog/api/BillingPeriod.java
index 7d129af..6ab91ed 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/BillingPeriod.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/BillingPeriod.java
@@ -17,20 +17,20 @@
 package com.ning.billing.catalog.api;
 
 public enum BillingPeriod {
-	MONTHLY(1),
-	QUARTERLY(3),
-	//SEMI_ANNUAL(6), ** not yet supported
-	ANNUAL(12),
-	//BI_ANNUAL(24); ** not yet supported
-	NO_BILLING_PERIOD(0);
+    MONTHLY(1),
+    QUARTERLY(3),
+    //SEMI_ANNUAL(6), ** not yet supported
+    ANNUAL(12),
+    //BI_ANNUAL(24); ** not yet supported
+    NO_BILLING_PERIOD(0);
 
     private final int numberOfMonths;
 
-    BillingPeriod(int numberOfMonths) {
+    BillingPeriod(final int numberOfMonths) {
         this.numberOfMonths = numberOfMonths;
     }
 
     public int getNumberOfMonths() {
         return numberOfMonths;
     }
-}
\ No newline at end of file
+}

diff --git a/api/src/main/java/com/ning/billing/catalog/api/Catalog.java b/api/src/main/java/com/ning/billing/catalog/api/Catalog.java
index 924a5e4..af96414 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/Catalog.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/Catalog.java
@@ -19,35 +19,35 @@ package com.ning.billing.catalog.api;
 import org.joda.time.DateTime;
 
 public interface Catalog {
-	//
+    //
     // Simple getters
     //
     public abstract String getCatalogName();
 
     public abstract Currency[] getSupportedCurrencies(DateTime requestedDate) throws CatalogApiException;
 
-	public abstract Product[] getProducts(DateTime requestedDate) throws CatalogApiException;
-	
-	public abstract Plan[] getPlans(DateTime requestedDate) throws CatalogApiException;
+    public abstract Product[] getProducts(DateTime requestedDate) throws CatalogApiException;
+
+    public abstract Plan[] getPlans(DateTime requestedDate) throws CatalogApiException;
+
+
+    //
+    // Find a plan
+    //
+
+    public abstract Plan findPlan(String name, DateTime requestedDate) throws CatalogApiException;
 
-	
-	//
-	// Find a plan
-	//
+    public abstract Plan findPlan(String productName, BillingPeriod term, String priceListName,
+                                  DateTime requestedDate) throws CatalogApiException;
 
-	public abstract Plan findPlan(String name, DateTime requestedDate) throws CatalogApiException;
+    public abstract Plan findPlan(String name, DateTime effectiveDate, DateTime subscriptionStartDate) throws CatalogApiException;
 
-	public abstract Plan findPlan(String productName, BillingPeriod term, String priceListName,
-									DateTime requestedDate) throws CatalogApiException;
-	
-	public abstract Plan findPlan(String name, DateTime effectiveDate, DateTime subscriptionStartDate) throws CatalogApiException;
+    public abstract Plan findPlan(String productName, BillingPeriod term, String priceListName,
+                                  DateTime requestedDate, DateTime subscriptionStartDate) throws CatalogApiException;
 
-	public abstract Plan findPlan(String productName, BillingPeriod term, String priceListName,
-									DateTime requestedDate, DateTime subscriptionStartDate) throws CatalogApiException;
-	
-	//
-	// Find a product
-	//
+    //
+    // Find a product
+    //
     public abstract Product findProduct(String name, DateTime requestedDate) throws CatalogApiException;
 
     //
@@ -63,11 +63,11 @@ public interface Catalog {
     //
     // Rules
     //
-	public abstract ActionPolicy planChangePolicy(PlanPhaseSpecifier from,
-			PlanSpecifier to, DateTime requestedDate) throws CatalogApiException;
+    public abstract ActionPolicy planChangePolicy(PlanPhaseSpecifier from,
+                                                  PlanSpecifier to, DateTime requestedDate) throws CatalogApiException;
 
-	public abstract PlanChangeResult planChange(PlanPhaseSpecifier from,
-			PlanSpecifier to, DateTime requestedDate) throws CatalogApiException;
+    public abstract PlanChangeResult planChange(PlanPhaseSpecifier from,
+                                                PlanSpecifier to, DateTime requestedDate) throws CatalogApiException;
 
     public abstract ActionPolicy planCancelPolicy(PlanPhaseSpecifier planPhase, DateTime requestedDate) throws CatalogApiException;
 
@@ -76,8 +76,8 @@ public interface Catalog {
     public abstract BillingAlignment billingAlignment(PlanPhaseSpecifier planPhase, DateTime requestedDate) throws CatalogApiException;
 
     public abstract PlanAlignmentChange planChangeAlignment(PlanPhaseSpecifier from,
-			PlanSpecifier to, DateTime requestedDate) throws CatalogApiException;
+                                                            PlanSpecifier to, DateTime requestedDate) throws CatalogApiException;
 
     public abstract boolean canCreatePlan(PlanSpecifier specifier, DateTime requestedDate) throws CatalogApiException;
-		
+
 }

diff --git a/api/src/main/java/com/ning/billing/catalog/api/CatalogApiException.java b/api/src/main/java/com/ning/billing/catalog/api/CatalogApiException.java
index 3de9eb8..5473f15 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/CatalogApiException.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/CatalogApiException.java
@@ -20,14 +20,14 @@ import com.ning.billing.BillingExceptionBase;
 import com.ning.billing.ErrorCode;
 
 public class CatalogApiException extends BillingExceptionBase {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	public CatalogApiException(Throwable cause, ErrorCode code, Object... args) {
-		super(cause, code, args);
-	}
+    public CatalogApiException(final Throwable cause, final ErrorCode code, final Object... args) {
+        super(cause, code, args);
+    }
 
-	public CatalogApiException(ErrorCode code, Object... args) {
-		super(code, args);
-	}
+    public CatalogApiException(final ErrorCode code, final Object... args) {
+        super(code, args);
+    }
 
 }

diff --git a/api/src/main/java/com/ning/billing/catalog/api/CatalogService.java b/api/src/main/java/com/ning/billing/catalog/api/CatalogService.java
index c363a87..6b7b673 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/CatalogService.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/CatalogService.java
@@ -20,7 +20,8 @@ import com.ning.billing.lifecycle.KillbillService;
 
 public interface CatalogService extends KillbillService {
 
-	public abstract Catalog getFullCatalog();
-	public abstract StaticCatalog getCurrentCatalog();
+    public abstract Catalog getFullCatalog();
 
-}
\ No newline at end of file
+    public abstract StaticCatalog getCurrentCatalog();
+
+}

diff --git a/api/src/main/java/com/ning/billing/catalog/api/Currency.java b/api/src/main/java/com/ning/billing/catalog/api/Currency.java
index 3bef242..09e9211 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/Currency.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/Currency.java
@@ -21,12 +21,12 @@ import javax.xml.bind.annotation.XmlEnum;
 
 @XmlEnum
 public enum Currency {
-	GBP,
-	MXN,
-	BRL,
-	EUR,
-	AUD,
-	USD;
+    GBP,
+    MXN,
+    BRL,
+    EUR,
+    AUD,
+    USD;
 // Unsupported
 //	CAD,
 //	JPY

diff --git a/api/src/main/java/com/ning/billing/catalog/api/CurrencyValueNull.java b/api/src/main/java/com/ning/billing/catalog/api/CurrencyValueNull.java
index 4130f9f..5cbd5ef 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/CurrencyValueNull.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/CurrencyValueNull.java
@@ -19,14 +19,14 @@ package com.ning.billing.catalog.api;
 import com.ning.billing.ErrorCode;
 
 public class CurrencyValueNull extends CatalogApiException {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	public CurrencyValueNull(Throwable cause, Object... args) {
-		super(cause, ErrorCode.CAT_PRICE_VALUE_NULL_FOR_CURRENCY, args);
-	}
+    public CurrencyValueNull(final Throwable cause, final Object... args) {
+        super(cause, ErrorCode.CAT_PRICE_VALUE_NULL_FOR_CURRENCY, args);
+    }
 
-	public CurrencyValueNull(Object... args) {
-		super(ErrorCode.CAT_PRICE_VALUE_NULL_FOR_CURRENCY, args);
-	}
+    public CurrencyValueNull(final Object... args) {
+        super(ErrorCode.CAT_PRICE_VALUE_NULL_FOR_CURRENCY, args);
+    }
 
 }

diff --git a/api/src/main/java/com/ning/billing/catalog/api/Duration.java b/api/src/main/java/com/ning/billing/catalog/api/Duration.java
index 90ea5c2..fe1b01a 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/Duration.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/Duration.java
@@ -21,11 +21,11 @@ import org.joda.time.Period;
 
 public interface Duration {
 
-	public abstract TimeUnit getUnit();
+    public abstract TimeUnit getUnit();
 
-	public abstract int getNumber();
+    public abstract int getNumber();
 
     public DateTime addToDateTime(DateTime dateTime);
 
     public Period toJodaPeriod();
-}
\ No newline at end of file
+}

diff --git a/api/src/main/java/com/ning/billing/catalog/api/IllegalPlanChange.java b/api/src/main/java/com/ning/billing/catalog/api/IllegalPlanChange.java
index 21bd513..be661fb 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/IllegalPlanChange.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/IllegalPlanChange.java
@@ -19,17 +19,17 @@ package com.ning.billing.catalog.api;
 import com.ning.billing.ErrorCode;
 
 public class IllegalPlanChange extends CatalogApiException {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	public IllegalPlanChange(Throwable cause, PlanPhaseSpecifier from,
-			PlanSpecifier to) {
-		super(cause, ErrorCode.CAT_ILLEGAL_CHANGE_REQUEST, from.getProductName(), from.getBillingPeriod(), from.getPriceListName(), to.getProductName(), to.getBillingPeriod(), to.getPriceListName());
-	}
+    public IllegalPlanChange(final Throwable cause, final PlanPhaseSpecifier from,
+                             final PlanSpecifier to) {
+        super(cause, ErrorCode.CAT_ILLEGAL_CHANGE_REQUEST, from.getProductName(), from.getBillingPeriod(), from.getPriceListName(), to.getProductName(), to.getBillingPeriod(), to.getPriceListName());
+    }
 
-	public IllegalPlanChange(PlanPhaseSpecifier from,
-			PlanSpecifier to) {
-		super(ErrorCode.CAT_ILLEGAL_CHANGE_REQUEST, from.getProductName(), from.getBillingPeriod(), from.getPriceListName(), to.getProductName(), to.getBillingPeriod(), to.getPriceListName());
-	}
+    public IllegalPlanChange(final PlanPhaseSpecifier from,
+                             final PlanSpecifier to) {
+        super(ErrorCode.CAT_ILLEGAL_CHANGE_REQUEST, from.getProductName(), from.getBillingPeriod(), from.getPriceListName(), to.getProductName(), to.getBillingPeriod(), to.getPriceListName());
+    }
 
 
 }

diff --git a/api/src/main/java/com/ning/billing/catalog/api/InternationalPrice.java b/api/src/main/java/com/ning/billing/catalog/api/InternationalPrice.java
index e047175..7f8ffef 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/InternationalPrice.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/InternationalPrice.java
@@ -21,10 +21,10 @@ import java.math.BigDecimal;
 
 public interface InternationalPrice {
 
-	public abstract Price[] getPrices();
+    public abstract Price[] getPrices();
 
-	public abstract BigDecimal getPrice(Currency currency) throws CatalogApiException;
+    public abstract BigDecimal getPrice(Currency currency) throws CatalogApiException;
 
-	public abstract boolean isZero();
+    public abstract boolean isZero();
 
-}
\ No newline at end of file
+}

diff --git a/api/src/main/java/com/ning/billing/catalog/api/InvalidConfigException.java b/api/src/main/java/com/ning/billing/catalog/api/InvalidConfigException.java
index 328abaa..301ca3c 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/InvalidConfigException.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/InvalidConfigException.java
@@ -17,14 +17,14 @@
 package com.ning.billing.catalog.api;
 
 public class InvalidConfigException extends Exception {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	public InvalidConfigException(String arg0, Throwable arg1) {
-		super(arg0, arg1);
-	}
+    public InvalidConfigException(final String arg0, final Throwable arg1) {
+        super(arg0, arg1);
+    }
 
-	public InvalidConfigException(String arg0) {
-		super(arg0);
-	}
+    public InvalidConfigException(final String arg0) {
+        super(arg0);
+    }
 
 }

diff --git a/api/src/main/java/com/ning/billing/catalog/api/Listing.java b/api/src/main/java/com/ning/billing/catalog/api/Listing.java
index 3fa0229..69ac8b5 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/Listing.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/Listing.java
@@ -17,8 +17,8 @@
 package com.ning.billing.catalog.api;
 
 public interface Listing {
-    
+
     Plan getPlan();
-    
+
     PriceList getPriceList();
 }

diff --git a/api/src/main/java/com/ning/billing/catalog/api/MigrationPlan.java b/api/src/main/java/com/ning/billing/catalog/api/MigrationPlan.java
index a6f4e91..cdb0433 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/MigrationPlan.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/MigrationPlan.java
@@ -17,6 +17,6 @@
 package com.ning.billing.catalog.api;
 
 public interface MigrationPlan extends Plan {
-	public static final String MIGRATION_PLAN_NAME = "__KILLBILL_MIGRATION_PLAN__";
-	public static final String MIGRATION_PLAN_PHASE_NAME = "__KILLBILL_MIGRATION_PLAN_PHASE__";
+    public static final String MIGRATION_PLAN_NAME = "__KILLBILL_MIGRATION_PLAN__";
+    public static final String MIGRATION_PLAN_PHASE_NAME = "__KILLBILL_MIGRATION_PLAN_PHASE__";
 }

diff --git a/api/src/main/java/com/ning/billing/catalog/api/OverdueActions.java b/api/src/main/java/com/ning/billing/catalog/api/OverdueActions.java
index 8525d91..d73db06 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/OverdueActions.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/OverdueActions.java
@@ -16,7 +16,7 @@
 
 package com.ning.billing.catalog.api;
 
-public enum OverdueActions  {
-	CANCEL,
-	PAYMENT_RETRY
+public enum OverdueActions {
+    CANCEL,
+    PAYMENT_RETRY
 }

diff --git a/api/src/main/java/com/ning/billing/catalog/api/PhaseType.java b/api/src/main/java/com/ning/billing/catalog/api/PhaseType.java
index 06678c7..3a302ed 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/PhaseType.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/PhaseType.java
@@ -17,8 +17,8 @@
 package com.ning.billing.catalog.api;
 
 public enum PhaseType {
-	TRIAL,
-	DISCOUNT,
-	FIXEDTERM,
-	EVERGREEN
+    TRIAL,
+    DISCOUNT,
+    FIXEDTERM,
+    EVERGREEN
 }

diff --git a/api/src/main/java/com/ning/billing/catalog/api/Plan.java b/api/src/main/java/com/ning/billing/catalog/api/Plan.java
index 3abbfbe..8518b94 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/Plan.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/Plan.java
@@ -23,28 +23,28 @@ import org.joda.time.DateTime;
 
 public interface Plan {
 
-	public abstract PlanPhase[] getInitialPhases();
+    public abstract PlanPhase[] getInitialPhases();
 
-	public abstract Product getProduct();
+    public abstract Product getProduct();
 
-	public abstract String getName();
+    public abstract String getName();
 
-	public abstract boolean isRetired();
+    public abstract boolean isRetired();
 
-	public abstract Iterator<PlanPhase> getInitialPhaseIterator();
+    public abstract Iterator<PlanPhase> getInitialPhaseIterator();
 
-	public abstract PlanPhase getFinalPhase();
+    public abstract PlanPhase getFinalPhase();
 
-	public abstract BillingPeriod getBillingPeriod();
+    public abstract BillingPeriod getBillingPeriod();
 
-	public abstract int getPlansAllowedInBundle();
+    public abstract int getPlansAllowedInBundle();
 
-	public abstract PlanPhase[] getAllPhases();
+    public abstract PlanPhase[] getAllPhases();
 
-	public abstract Date getEffectiveDateForExistingSubscriptons();
+    public abstract Date getEffectiveDateForExistingSubscriptons();
 
-	public abstract PlanPhase findPhase(String name) throws CatalogApiException;
+    public abstract PlanPhase findPhase(String name) throws CatalogApiException;
 
-	public abstract DateTime dateOfFirstRecurringNonZeroCharge(DateTime subscriptionStartDate);
-	
-}
\ No newline at end of file
+    public abstract DateTime dateOfFirstRecurringNonZeroCharge(DateTime subscriptionStartDate);
+
+}

diff --git a/api/src/main/java/com/ning/billing/catalog/api/PlanAlignmentChange.java b/api/src/main/java/com/ning/billing/catalog/api/PlanAlignmentChange.java
index c883690..fc56ccd 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/PlanAlignmentChange.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/PlanAlignmentChange.java
@@ -17,8 +17,8 @@
 package com.ning.billing.catalog.api;
 
 public enum PlanAlignmentChange {
-	START_OF_BUNDLE,
-	START_OF_SUBSCRIPTION,
-	CHANGE_OF_PLAN,
-	CHANGE_OF_PRICELIST
+    START_OF_BUNDLE,
+    START_OF_SUBSCRIPTION,
+    CHANGE_OF_PLAN,
+    CHANGE_OF_PRICELIST
 }

diff --git a/api/src/main/java/com/ning/billing/catalog/api/PlanAlignmentCreate.java b/api/src/main/java/com/ning/billing/catalog/api/PlanAlignmentCreate.java
index 7603d5e..5f4a851 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/PlanAlignmentCreate.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/PlanAlignmentCreate.java
@@ -17,6 +17,6 @@
 package com.ning.billing.catalog.api;
 
 public enum PlanAlignmentCreate {
-	START_OF_BUNDLE,
-	START_OF_SUBSCRIPTION,
+    START_OF_BUNDLE,
+    START_OF_SUBSCRIPTION,
 }

diff --git a/api/src/main/java/com/ning/billing/catalog/api/PlanChangeResult.java b/api/src/main/java/com/ning/billing/catalog/api/PlanChangeResult.java
index 3974e87..705df5a 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/PlanChangeResult.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/PlanChangeResult.java
@@ -17,29 +17,29 @@
 package com.ning.billing.catalog.api;
 
 public class PlanChangeResult {
- 
-	private final PriceList newPriceList;
-	private final ActionPolicy policy;
-	private final PlanAlignmentChange alignment;
-	
-	public PlanChangeResult(PriceList newPriceList, ActionPolicy policy, PlanAlignmentChange alignment) {
-		super();
-		this.newPriceList = newPriceList;
-		this.policy = policy;
-		this.alignment = alignment;
-	}
-
-	public PriceList getNewPriceList() {
-		return newPriceList;
-	}
-
-	public ActionPolicy getPolicy() {
-		return policy;
-	}
-
-	public PlanAlignmentChange getAlignment() {
-		return alignment;
-	}	
-	 
-	
+
+    private final PriceList newPriceList;
+    private final ActionPolicy policy;
+    private final PlanAlignmentChange alignment;
+
+    public PlanChangeResult(final PriceList newPriceList, final ActionPolicy policy, final PlanAlignmentChange alignment) {
+        super();
+        this.newPriceList = newPriceList;
+        this.policy = policy;
+        this.alignment = alignment;
+    }
+
+    public PriceList getNewPriceList() {
+        return newPriceList;
+    }
+
+    public ActionPolicy getPolicy() {
+        return policy;
+    }
+
+    public PlanAlignmentChange getAlignment() {
+        return alignment;
+    }
+
+
 }

diff --git a/api/src/main/java/com/ning/billing/catalog/api/PlanPhase.java b/api/src/main/java/com/ning/billing/catalog/api/PlanPhase.java
index 299909c..fa43433 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/PlanPhase.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/PlanPhase.java
@@ -19,21 +19,19 @@ package com.ning.billing.catalog.api;
 
 public interface PlanPhase {
 
-	public abstract InternationalPrice getRecurringPrice();
+    public abstract InternationalPrice getRecurringPrice();
 
-	public abstract InternationalPrice getFixedPrice();
+    public abstract InternationalPrice getFixedPrice();
 
-	public abstract BillingPeriod getBillingPeriod();
+    public abstract BillingPeriod getBillingPeriod();
 
-	public abstract String getName();
+    public abstract String getName();
 
-	public abstract Plan getPlan();
+    public abstract Plan getPlan();
 
-	public abstract Duration getDuration();
+    public abstract Duration getDuration();
 
-	public abstract PhaseType getPhaseType();
+    public abstract PhaseType getPhaseType();
 
 
-	
-
-}
\ No newline at end of file
+}

diff --git a/api/src/main/java/com/ning/billing/catalog/api/PlanPhaseSpecifier.java b/api/src/main/java/com/ning/billing/catalog/api/PlanPhaseSpecifier.java
index 18c864a..d737426 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/PlanPhaseSpecifier.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/PlanPhaseSpecifier.java
@@ -16,41 +16,44 @@
 
 package com.ning.billing.catalog.api;
 
-public class PlanPhaseSpecifier  {
-
-	private final PhaseType phaseType;
-	private final String productName;
-	private final ProductCategory productCategory;
-	private final BillingPeriod billingPeriod;
-	private final String priceListName;
-	
-	public PlanPhaseSpecifier(String productName, ProductCategory productCategory, BillingPeriod billingPeriod,
-			String priceListName, PhaseType phaseType) {
-		this.phaseType = phaseType;
-		this.productName = productName;
-		this.productCategory = productCategory;
-		this.billingPeriod = billingPeriod;
-		this.priceListName = priceListName;
-	}
-	
-	public String getProductName() {
-		return productName;
-	}
-	public ProductCategory getProductCategory() {
-		return productCategory;
-	}
-	public BillingPeriod getBillingPeriod() {
-		return billingPeriod;
-	}
-	public String getPriceListName() {
-		return priceListName;
-	}
-
-	public PhaseType getPhaseType() {
-		return phaseType;
-	}
-
-	public PlanSpecifier toPlanSpecifier() {
-		return new PlanSpecifier(productName, productCategory, billingPeriod, priceListName);
-	}
+public class PlanPhaseSpecifier {
+
+    private final PhaseType phaseType;
+    private final String productName;
+    private final ProductCategory productCategory;
+    private final BillingPeriod billingPeriod;
+    private final String priceListName;
+
+    public PlanPhaseSpecifier(final String productName, final ProductCategory productCategory, final BillingPeriod billingPeriod,
+                              final String priceListName, final PhaseType phaseType) {
+        this.phaseType = phaseType;
+        this.productName = productName;
+        this.productCategory = productCategory;
+        this.billingPeriod = billingPeriod;
+        this.priceListName = priceListName;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public ProductCategory getProductCategory() {
+        return productCategory;
+    }
+
+    public BillingPeriod getBillingPeriod() {
+        return billingPeriod;
+    }
+
+    public String getPriceListName() {
+        return priceListName;
+    }
+
+    public PhaseType getPhaseType() {
+        return phaseType;
+    }
+
+    public PlanSpecifier toPlanSpecifier() {
+        return new PlanSpecifier(productName, productCategory, billingPeriod, priceListName);
+    }
 }

diff --git a/api/src/main/java/com/ning/billing/catalog/api/PlanSpecifier.java b/api/src/main/java/com/ning/billing/catalog/api/PlanSpecifier.java
index 39bba68..bc88ae6 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/PlanSpecifier.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/PlanSpecifier.java
@@ -17,38 +17,41 @@
 package com.ning.billing.catalog.api;
 
 public class PlanSpecifier {
-	private final String productName;
-	private final ProductCategory productCategory;
-	private final BillingPeriod billingPeriod;
-	private final String priceListName;
-	
-	public PlanSpecifier(String productName, ProductCategory productCategory, BillingPeriod billingPeriod,
-			String priceListName) {
-		super();
-		this.productName = productName;
-		this.productCategory = productCategory;
-		this.billingPeriod = billingPeriod;
-		this.priceListName = priceListName;
-	}
-	
-	public PlanSpecifier(PlanPhaseSpecifier planPhase) {
-		super();
-		this.productName = planPhase.getProductName();
-		this.productCategory = planPhase.getProductCategory();
-		this.billingPeriod = planPhase.getBillingPeriod();
-		this.priceListName = planPhase.getPriceListName();
-	}
-	
-	public String getProductName() {
-		return productName;
-	}
-	public ProductCategory getProductCategory() {
-		return productCategory;
-	}
-	public BillingPeriod getBillingPeriod() {
-		return billingPeriod;
-	}
-	public String getPriceListName() {
-		return priceListName;
-	}
+    private final String productName;
+    private final ProductCategory productCategory;
+    private final BillingPeriod billingPeriod;
+    private final String priceListName;
+
+    public PlanSpecifier(final String productName, final ProductCategory productCategory, final BillingPeriod billingPeriod,
+                         final String priceListName) {
+        super();
+        this.productName = productName;
+        this.productCategory = productCategory;
+        this.billingPeriod = billingPeriod;
+        this.priceListName = priceListName;
+    }
+
+    public PlanSpecifier(final PlanPhaseSpecifier planPhase) {
+        super();
+        this.productName = planPhase.getProductName();
+        this.productCategory = planPhase.getProductCategory();
+        this.billingPeriod = planPhase.getBillingPeriod();
+        this.priceListName = planPhase.getPriceListName();
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public ProductCategory getProductCategory() {
+        return productCategory;
+    }
+
+    public BillingPeriod getBillingPeriod() {
+        return billingPeriod;
+    }
+
+    public String getPriceListName() {
+        return priceListName;
+    }
 }

diff --git a/api/src/main/java/com/ning/billing/catalog/api/Price.java b/api/src/main/java/com/ning/billing/catalog/api/Price.java
index cf33ab0..a98275a 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/Price.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/Price.java
@@ -21,8 +21,8 @@ import java.math.BigDecimal;
 
 public interface Price {
 
-	public abstract Currency getCurrency();
+    public abstract Currency getCurrency();
 
-	public abstract BigDecimal getValue() throws CurrencyValueNull;
+    public abstract BigDecimal getValue() throws CurrencyValueNull;
 
-}
\ No newline at end of file
+}

diff --git a/api/src/main/java/com/ning/billing/catalog/api/PriceList.java b/api/src/main/java/com/ning/billing/catalog/api/PriceList.java
index 58a98fa..7ba912a 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/PriceList.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/PriceList.java
@@ -19,10 +19,10 @@ package com.ning.billing.catalog.api;
 
 public interface PriceList {
 
-	public abstract String getName();
+    public abstract String getName();
 
-	public abstract boolean isRetired();
+    public abstract boolean isRetired();
 
-	public abstract Plan findPlan(Product product, BillingPeriod period);
+    public abstract Plan findPlan(Product product, BillingPeriod period);
 
-}
\ No newline at end of file
+}

diff --git a/api/src/main/java/com/ning/billing/catalog/api/PriceListSet.java b/api/src/main/java/com/ning/billing/catalog/api/PriceListSet.java
index 33adcca..5e78044 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/PriceListSet.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/PriceListSet.java
@@ -18,8 +18,8 @@ package com.ning.billing.catalog.api;
 
 public interface PriceListSet {
 
-	public static final String DEFAULT_PRICELIST_NAME="DEFAULT";
+    public static final String DEFAULT_PRICELIST_NAME = "DEFAULT";
 
-	public abstract Plan getPlanListFrom(String priceListName, Product product, BillingPeriod period);
+    public abstract Plan getPlanListFrom(String priceListName, Product product, BillingPeriod period);
 
-}
\ No newline at end of file
+}

diff --git a/api/src/main/java/com/ning/billing/catalog/api/Product.java b/api/src/main/java/com/ning/billing/catalog/api/Product.java
index e226a0d..cb08271 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/Product.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/Product.java
@@ -19,17 +19,17 @@ package com.ning.billing.catalog.api;
 
 public interface Product {
 
-	public abstract String getName();
+    public abstract String getName();
 
-	public abstract boolean isRetired();
+    public abstract boolean isRetired();
 
-	public abstract Product[] getAvailable();
+    public abstract Product[] getAvailable();
 
-	public abstract Product[] getIncluded();
+    public abstract Product[] getIncluded();
 
-	public abstract ProductCategory getCategory();
+    public abstract ProductCategory getCategory();
 
-	public abstract String getCatalogName();
+    public abstract String getCatalogName();
 
 
-}
\ No newline at end of file
+}

diff --git a/api/src/main/java/com/ning/billing/catalog/api/ProductCategory.java b/api/src/main/java/com/ning/billing/catalog/api/ProductCategory.java
index 22eb658..5c67ec2 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/ProductCategory.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/ProductCategory.java
@@ -17,7 +17,7 @@
 package com.ning.billing.catalog.api;
 
 public enum ProductCategory {
-	BASE,
-	ADD_ON,
-	STANDALONE
+    BASE,
+    ADD_ON,
+    STANDALONE
 }

diff --git a/api/src/main/java/com/ning/billing/catalog/api/StaticCatalog.java b/api/src/main/java/com/ning/billing/catalog/api/StaticCatalog.java
index 0b2ef57..3c35e29 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/StaticCatalog.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/StaticCatalog.java
@@ -25,45 +25,45 @@ public interface StaticCatalog {
     // Simple getters
     //
     public abstract String getCatalogName();
-    
+
     public abstract Date getEffectiveDate() throws CatalogApiException;
 
     public abstract Currency[] getCurrentSupportedCurrencies() throws CatalogApiException;
 
-	public abstract Product[] getCurrentProducts() throws CatalogApiException;
-	
-	public abstract Plan[] getCurrentPlans() throws CatalogApiException;
-	
-	//
-	// Find a plan
-	//
-	public abstract Plan findCurrentPlan(String productName, BillingPeriod term, String priceList) throws CatalogApiException;
+    public abstract Product[] getCurrentProducts() throws CatalogApiException;
+
+    public abstract Plan[] getCurrentPlans() throws CatalogApiException;
+
+    //
+    // Find a plan
+    //
+    public abstract Plan findCurrentPlan(String productName, BillingPeriod term, String priceList) throws CatalogApiException;
 
-	public abstract Plan findCurrentPlan(String name) throws CatalogApiException;
+    public abstract Plan findCurrentPlan(String name) throws CatalogApiException;
 
-	//
-	// Find a product
-	//
+    //
+    // Find a product
+    //
     public abstract Product findCurrentProduct(String name) throws CatalogApiException;
 
     //
     // Find a phase
     //
-    public abstract  PlanPhase findCurrentPhase(String name) throws CatalogApiException;
-    
+    public abstract PlanPhase findCurrentPhase(String name) throws CatalogApiException;
+
     //
     // Find a pricelist
     //
     public abstract PriceList findCurrentPricelist(String name) throws CatalogApiException;
-    
+
     //
     //  
     //
-	public abstract ActionPolicy planChangePolicy(PlanPhaseSpecifier from,
-			PlanSpecifier to) throws CatalogApiException;
+    public abstract ActionPolicy planChangePolicy(PlanPhaseSpecifier from,
+                                                  PlanSpecifier to) throws CatalogApiException;
 
-	public abstract PlanChangeResult planChange(PlanPhaseSpecifier from,
-			PlanSpecifier to) throws CatalogApiException;
+    public abstract PlanChangeResult planChange(PlanPhaseSpecifier from,
+                                                PlanSpecifier to) throws CatalogApiException;
 
 
     public abstract ActionPolicy planCancelPolicy(PlanPhaseSpecifier planPhase) throws CatalogApiException;
@@ -73,10 +73,10 @@ public interface StaticCatalog {
     public abstract BillingAlignment billingAlignment(PlanPhaseSpecifier planPhase) throws CatalogApiException;
 
     public abstract PlanAlignmentChange planChangeAlignment(PlanPhaseSpecifier from,
-			PlanSpecifier to) throws CatalogApiException;
+                                                            PlanSpecifier to) throws CatalogApiException;
 
     public abstract boolean canCreatePlan(PlanSpecifier specifier) throws CatalogApiException;
 
     public abstract List<Listing> getAvailableAddonListings(String baseProductName) throws CatalogApiException;
 
-}
\ No newline at end of file
+}

diff --git a/api/src/main/java/com/ning/billing/catalog/api/TimeUnit.java b/api/src/main/java/com/ning/billing/catalog/api/TimeUnit.java
index 5271e29..019bfa9 100644
--- a/api/src/main/java/com/ning/billing/catalog/api/TimeUnit.java
+++ b/api/src/main/java/com/ning/billing/catalog/api/TimeUnit.java
@@ -20,8 +20,8 @@ import javax.xml.bind.annotation.XmlEnum;
 
 @XmlEnum
 public enum TimeUnit {
-	DAYS,
-	MONTHS,
-	YEARS,
-	UNLIMITED
-}
\ No newline at end of file
+    DAYS,
+    MONTHS,
+    YEARS,
+    UNLIMITED
+}

diff --git a/api/src/main/java/com/ning/billing/config/EntitlementConfig.java b/api/src/main/java/com/ning/billing/config/EntitlementConfig.java
index 12418c6..1f68e5c 100644
--- a/api/src/main/java/com/ning/billing/config/EntitlementConfig.java
+++ b/api/src/main/java/com/ning/billing/config/EntitlementConfig.java
@@ -19,16 +19,14 @@ package com.ning.billing.config;
 import org.skife.config.Config;
 import org.skife.config.Default;
 
-import com.google.common.annotations.VisibleForTesting;
+public interface EntitlementConfig extends NotificationConfig, KillbillConfig {
 
-public interface EntitlementConfig extends NotificationConfig, KillbillConfig  {
-
-	@Override
+    @Override
     @Config("killbill.entitlement.engine.notifications.sleep")
     @Default("500")
-    public long getSleepTimeMs();    
+    public long getSleepTimeMs();
 
-	@Override
+    @Override
     @Config("killbill.notifications.off")
     @Default("false")
     public boolean isNotificationProcessingOff();

diff --git a/api/src/main/java/com/ning/billing/config/PaymentConfig.java b/api/src/main/java/com/ning/billing/config/PaymentConfig.java
index 7e8d5cc..9da471d 100644
--- a/api/src/main/java/com/ning/billing/config/PaymentConfig.java
+++ b/api/src/main/java/com/ning/billing/config/PaymentConfig.java
@@ -22,8 +22,8 @@ import org.skife.config.Config;
 import org.skife.config.Default;
 
 
-public interface PaymentConfig extends NotificationConfig, KillbillConfig  {
-	
+public interface PaymentConfig extends NotificationConfig, KillbillConfig {
+
 
     @Config("killbill.payment.provider.default")
     @Default("noop")
@@ -45,12 +45,12 @@ public interface PaymentConfig extends NotificationConfig, KillbillConfig  {
     @Default("8")
     public int getPluginFailureRetryMaxAttempts();
 
-	@Override
+    @Override
     @Config("killbill.payment.engine.notifications.sleep")
     @Default("500")
     public long getSleepTimeMs();
 
-	@Override
+    @Override
     @Config("killbill.payment.engine.events.off")
     @Default("false")
     public boolean isNotificationProcessingOff();

diff --git a/api/src/main/java/com/ning/billing/entitlement/api/billing/BillingEvent.java b/api/src/main/java/com/ning/billing/entitlement/api/billing/BillingEvent.java
index db1761e..ee661bc 100644
--- a/api/src/main/java/com/ning/billing/entitlement/api/billing/BillingEvent.java
+++ b/api/src/main/java/com/ning/billing/entitlement/api/billing/BillingEvent.java
@@ -37,87 +37,75 @@ public interface BillingEvent extends Comparable<BillingEvent> {
     public Account getAccount();
 
     /**
-     *
      * @return the billCycleDay as seen for that subscription at that time
-     *
-     * Note: The billCycleDay may come from the Account, or the bundle or the subscription itself
+     *         <p/>
+     *         Note: The billCycleDay may come from the Account, or the bundle or the subscription itself
      */
     public int getBillCycleDay();
 
     /**
-     *
      * @return the subscription
      */
     public Subscription getSubscription();
 
     /**
-     *
      * @return the date for when that event became effective
      */
     public DateTime getEffectiveDate();
 
     /**
-     *
      * @return the plan phase
      */
     public PlanPhase getPlanPhase();
 
 
     /**
-     *
      * @return the plan
      */
     public Plan getPlan();
 
     /**
-     *
      * @return the billing period for the active phase
      */
     public BillingPeriod getBillingPeriod();
 
     /**
-     *
      * @return the billing mode for the current event
      */
     public BillingModeType getBillingMode();
 
     /**
-     *
      * @return the description of the billing event
      */
     public String getDescription();
 
     /**
-     *
      * @return the fixed price for the phase
      */
     public BigDecimal getFixedPrice();
 
     /**
-     *
      * @return the recurring price for the phase
      */
     public BigDecimal getRecurringPrice();
 
     /**
-     *
      * @return the currency for the account being invoiced
      */
     public Currency getCurrency();
 
-	/**
-	 * @return the transition type of the underlying subscription event that triggered this
-	 */
-	public SubscriptionTransitionType getTransitionType();
-
-	/**
-	 * @return a unique long indicating the ordering on which events got inserted on disk-- used for sorting only
-	 */
-	public Long getTotalOrdering();
-	
-	/**
-	 * 
-	 * @return The TimeZone of the account
-	 */
+    /**
+     * @return the transition type of the underlying subscription event that triggered this
+     */
+    public SubscriptionTransitionType getTransitionType();
+
+    /**
+     * @return a unique long indicating the ordering on which events got inserted on disk-- used for sorting only
+     */
+    public Long getTotalOrdering();
+
+    /**
+     * @return The TimeZone of the account
+     */
     public DateTimeZone getTimeZone();
- }
+}

diff --git a/api/src/main/java/com/ning/billing/entitlement/api/billing/ChargeThruApi.java b/api/src/main/java/com/ning/billing/entitlement/api/billing/ChargeThruApi.java
index 69eb454..25a643f 100644
--- a/api/src/main/java/com/ning/billing/entitlement/api/billing/ChargeThruApi.java
+++ b/api/src/main/java/com/ning/billing/entitlement/api/billing/ChargeThruApi.java
@@ -19,7 +19,6 @@ package com.ning.billing.entitlement.api.billing;
 import java.util.UUID;
 
 import org.joda.time.DateTime;
-import org.skife.jdbi.v2.sqlobject.mixins.Transmogrifier;
 
 import com.ning.billing.util.callcontext.CallContext;
 
@@ -30,10 +29,10 @@ public interface ChargeThruApi {
      * @return UUID of
      */
     public UUID getAccountIdFromSubscriptionId(UUID subscriptionId) throws EntitlementBillingApiException;
-    
+
     /**
      * Sets the charged through date for the subscription with that Id.
-     * 
+     *
      * @param subscriptionId
      * @param ctd
      * @param context

diff --git a/api/src/main/java/com/ning/billing/entitlement/api/billing/EntitlementBillingApiException.java b/api/src/main/java/com/ning/billing/entitlement/api/billing/EntitlementBillingApiException.java
index 4c20f7c..7e16c7e 100644
--- a/api/src/main/java/com/ning/billing/entitlement/api/billing/EntitlementBillingApiException.java
+++ b/api/src/main/java/com/ning/billing/entitlement/api/billing/EntitlementBillingApiException.java
@@ -22,15 +22,15 @@ import com.ning.billing.ErrorCode;
 public class EntitlementBillingApiException extends BillingExceptionBase {
     private static final long serialVersionUID = 127392038L;
 
-    public EntitlementBillingApiException(Throwable cause, int code, final String msg) {
+    public EntitlementBillingApiException(final Throwable cause, final int code, final String msg) {
         super(cause, code, msg);
     }
 
-    public EntitlementBillingApiException(Throwable cause, ErrorCode code, final Object... args) {
+    public EntitlementBillingApiException(final Throwable cause, final ErrorCode code, final Object... args) {
         super(cause, code, args);
     }
 
-    public EntitlementBillingApiException(ErrorCode code, final Object... args) {
+    public EntitlementBillingApiException(final ErrorCode code, final Object... args) {
         super(code, args);
     }
 }

diff --git a/api/src/main/java/com/ning/billing/entitlement/api/migration/EntitlementMigrationApi.java b/api/src/main/java/com/ning/billing/entitlement/api/migration/EntitlementMigrationApi.java
index 09ac359..f0352e7 100644
--- a/api/src/main/java/com/ning/billing/entitlement/api/migration/EntitlementMigrationApi.java
+++ b/api/src/main/java/com/ning/billing/entitlement/api/migration/EntitlementMigrationApi.java
@@ -18,38 +18,43 @@ package com.ning.billing.entitlement.api.migration;
 
 import java.util.UUID;
 
-import com.ning.billing.util.callcontext.CallContext;
 import org.joda.time.DateTime;
 
 import com.ning.billing.catalog.api.PlanPhaseSpecifier;
 import com.ning.billing.catalog.api.ProductCategory;
+import com.ning.billing.util.callcontext.CallContext;
 
 public interface EntitlementMigrationApi {
 
 
     public interface EntitlementAccountMigration {
         public UUID getAccountKey();
-        public EntitlementBundleMigration [] getBundles();
+
+        public EntitlementBundleMigration[] getBundles();
     }
 
     public interface EntitlementBundleMigration {
         public String getBundleKey();
-        public EntitlementSubscriptionMigration [] getSubscriptions();
+
+        public EntitlementSubscriptionMigration[] getSubscriptions();
     }
 
     public interface EntitlementSubscriptionMigration {
         public ProductCategory getCategory();
+
         public DateTime getChargedThroughDate();
-        public EntitlementSubscriptionMigrationCase [] getSubscriptionCases();
+
+        public EntitlementSubscriptionMigrationCase[] getSubscriptionCases();
     }
 
     /**
-     *
      * Each case is either a PHASE or a different PlanSpecifier
      */
     public interface EntitlementSubscriptionMigrationCase {
         public PlanPhaseSpecifier getPlanPhaseSpecifier();
+
         public DateTime getEffectiveDate();
+
         public DateTime getCancelledDate();
     }
 
@@ -59,9 +64,9 @@ public interface EntitlementMigrationApi {
      * The semantics is 'all or nothing' (atomic operation)
      *
      * @param toBeMigrated all the bundles and associated subscription that should be migrated for the account
-     * @throws EntitlementMigrationApiException an entitlement api exception
-     *
+     * @throws EntitlementMigrationApiException
+     *          an entitlement api exception
      */
     public void migrate(EntitlementAccountMigration toBeMigrated, CallContext context)
-        throws EntitlementMigrationApiException;
+            throws EntitlementMigrationApiException;
 }

diff --git a/api/src/main/java/com/ning/billing/entitlement/api/migration/EntitlementMigrationApiException.java b/api/src/main/java/com/ning/billing/entitlement/api/migration/EntitlementMigrationApiException.java
index 55835fd..8a9881f 100644
--- a/api/src/main/java/com/ning/billing/entitlement/api/migration/EntitlementMigrationApiException.java
+++ b/api/src/main/java/com/ning/billing/entitlement/api/migration/EntitlementMigrationApiException.java
@@ -24,15 +24,15 @@ public class EntitlementMigrationApiException extends Exception {
         super();
     }
 
-    public EntitlementMigrationApiException(String message, Throwable cause) {
+    public EntitlementMigrationApiException(final String message, final Throwable cause) {
         super(message, cause);
     }
 
-    public EntitlementMigrationApiException(String message) {
+    public EntitlementMigrationApiException(final String message) {
         super(message);
     }
 
-    public EntitlementMigrationApiException(Throwable cause) {
+    public EntitlementMigrationApiException(final Throwable cause) {
         super(cause);
     }
 }

diff --git a/api/src/main/java/com/ning/billing/entitlement/api/timeline/BundleTimeline.java b/api/src/main/java/com/ning/billing/entitlement/api/timeline/BundleTimeline.java
index 6b12f9d..ff8823f 100644
--- a/api/src/main/java/com/ning/billing/entitlement/api/timeline/BundleTimeline.java
+++ b/api/src/main/java/com/ning/billing/entitlement/api/timeline/BundleTimeline.java
@@ -21,9 +21,9 @@ import java.util.UUID;
 public interface BundleTimeline {
 
     String getViewId();
-    
+
     UUID getBundleId();
-    
+
     String getExternalKey();
 
     List<SubscriptionTimeline> getSubscriptions();

diff --git a/api/src/main/java/com/ning/billing/entitlement/api/timeline/EntitlementRepairException.java b/api/src/main/java/com/ning/billing/entitlement/api/timeline/EntitlementRepairException.java
index 56cdd99..0e38426 100644
--- a/api/src/main/java/com/ning/billing/entitlement/api/timeline/EntitlementRepairException.java
+++ b/api/src/main/java/com/ning/billing/entitlement/api/timeline/EntitlementRepairException.java
@@ -24,18 +24,19 @@ public class EntitlementRepairException extends BillingExceptionBase {
 
     private static final long serialVersionUID = 19067233L;
 
-    public EntitlementRepairException(EntitlementUserApiException e) {
+    public EntitlementRepairException(final EntitlementUserApiException e) {
         super(e, e.getCode(), e.getMessage());
     }
-    
-    public EntitlementRepairException(CatalogApiException e) {
+
+    public EntitlementRepairException(final CatalogApiException e) {
         super(e, e.getCode(), e.getMessage());
     }
-    public EntitlementRepairException(Throwable e, ErrorCode code, Object...args) {
+
+    public EntitlementRepairException(final Throwable e, final ErrorCode code, final Object... args) {
         super(e, code, args);
     }
 
-    public EntitlementRepairException(ErrorCode code, Object...args) {
+    public EntitlementRepairException(final ErrorCode code, final Object... args) {
         super(code, args);
     }
 }

diff --git a/api/src/main/java/com/ning/billing/entitlement/api/timeline/EntitlementTimelineApi.java b/api/src/main/java/com/ning/billing/entitlement/api/timeline/EntitlementTimelineApi.java
index b76f25a..0bdf47f 100644
--- a/api/src/main/java/com/ning/billing/entitlement/api/timeline/EntitlementTimelineApi.java
+++ b/api/src/main/java/com/ning/billing/entitlement/api/timeline/EntitlementTimelineApi.java
@@ -20,8 +20,8 @@ import java.util.UUID;
 import com.ning.billing.util.callcontext.CallContext;
 
 public interface EntitlementTimelineApi {
-    
+
     public BundleTimeline getBundleRepair(final UUID bundleId) throws EntitlementRepairException;
-    
+
     public BundleTimeline repairBundle(final BundleTimeline input, final boolean dryRun, final CallContext context) throws EntitlementRepairException;
 }

diff --git a/api/src/main/java/com/ning/billing/entitlement/api/timeline/RepairEntitlementEvent.java b/api/src/main/java/com/ning/billing/entitlement/api/timeline/RepairEntitlementEvent.java
index 0ab6720..9a32c61 100644
--- a/api/src/main/java/com/ning/billing/entitlement/api/timeline/RepairEntitlementEvent.java
+++ b/api/src/main/java/com/ning/billing/entitlement/api/timeline/RepairEntitlementEvent.java
@@ -24,7 +24,7 @@ import com.ning.billing.util.bus.BusEvent;
 public interface RepairEntitlementEvent extends BusEvent {
 
     public UUID getAccountId();
-    
+
     public UUID getBundleId();
 
     public DateTime getEffectiveDate();

diff --git a/api/src/main/java/com/ning/billing/entitlement/api/timeline/SubscriptionTimeline.java b/api/src/main/java/com/ning/billing/entitlement/api/timeline/SubscriptionTimeline.java
index 434cb39..9374c62 100644
--- a/api/src/main/java/com/ning/billing/entitlement/api/timeline/SubscriptionTimeline.java
+++ b/api/src/main/java/com/ning/billing/entitlement/api/timeline/SubscriptionTimeline.java
@@ -26,24 +26,26 @@ import com.ning.billing.entitlement.api.SubscriptionTransitionType;
 public interface SubscriptionTimeline {
 
     public UUID getId();
-    
+
     public List<DeletedEvent> getDeletedEvents();
 
-    public List<NewEvent> getNewEvents();    
-   
-    public List<ExistingEvent> getExistingEvents();    
-    
+    public List<NewEvent> getNewEvents();
+
+    public List<ExistingEvent> getExistingEvents();
+
     public interface DeletedEvent {
         public UUID getEventId();
     }
-    
+
     public interface NewEvent {
         public PlanPhaseSpecifier getPlanPhaseSpecifier();
+
         public DateTime getRequestedDate();
+
         public SubscriptionTransitionType getSubscriptionTransitionType();
-        
+
     }
-    
+
     public interface ExistingEvent extends DeletedEvent, NewEvent {
         public DateTime getEffectiveDate();
     }

diff --git a/api/src/main/java/com/ning/billing/entitlement/api/user/EntitlementUserApi.java b/api/src/main/java/com/ning/billing/entitlement/api/user/EntitlementUserApi.java
index 1e8d7fd..3757319 100644
--- a/api/src/main/java/com/ning/billing/entitlement/api/user/EntitlementUserApi.java
+++ b/api/src/main/java/com/ning/billing/entitlement/api/user/EntitlementUserApi.java
@@ -19,11 +19,10 @@ package com.ning.billing.entitlement.api.user;
 import java.util.List;
 import java.util.UUID;
 
-import com.ning.billing.util.callcontext.CallContext;
 import org.joda.time.DateTime;
 
-import com.ning.billing.catalog.api.BillingPeriod;
 import com.ning.billing.catalog.api.PlanPhaseSpecifier;
+import com.ning.billing.util.callcontext.CallContext;
 
 
 public interface EntitlementUserApi {
@@ -39,17 +38,17 @@ public interface EntitlementUserApi {
     public List<Subscription> getSubscriptionsForBundle(UUID bundleId);
 
     public List<Subscription> getSubscriptionsForKey(String bundleKey);
-    
+
     public Subscription getBaseSubscription(UUID bundleId) throws EntitlementUserApiException;
 
     public SubscriptionBundle createBundleForAccount(UUID accountId, String bundleKey, CallContext context)
-        throws EntitlementUserApiException;
+            throws EntitlementUserApiException;
 
     public Subscription createSubscription(UUID bundleId, PlanPhaseSpecifier spec, DateTime requestedDate, CallContext context)
-        throws EntitlementUserApiException;
+            throws EntitlementUserApiException;
 
     public List<SubscriptionStatusDryRun> getDryRunChangePlanStatus(UUID subscriptionId, String productName, DateTime requestedDate)
-    throws EntitlementUserApiException;
-    
+            throws EntitlementUserApiException;
+
     public DateTime getNextBillingDate(UUID account);
 }

diff --git a/api/src/main/java/com/ning/billing/entitlement/api/user/EntitlementUserApiException.java b/api/src/main/java/com/ning/billing/entitlement/api/user/EntitlementUserApiException.java
index 11cf455..b4ecc4d 100644
--- a/api/src/main/java/com/ning/billing/entitlement/api/user/EntitlementUserApiException.java
+++ b/api/src/main/java/com/ning/billing/entitlement/api/user/EntitlementUserApiException.java
@@ -24,18 +24,19 @@ public class EntitlementUserApiException extends BillingExceptionBase {
 
     private static final long serialVersionUID = 19083233L;
 
-    public EntitlementUserApiException(CatalogApiException e) {
+    public EntitlementUserApiException(final CatalogApiException e) {
         super(e, e.getCode(), e.getMessage());
     }
-    public EntitlementUserApiException(Throwable e, ErrorCode code, Object...args) {
+
+    public EntitlementUserApiException(final Throwable e, final ErrorCode code, final Object... args) {
         super(e, code, args);
     }
 
-    public EntitlementUserApiException(Throwable e, int code, String message) {
+    public EntitlementUserApiException(final Throwable e, final int code, final String message) {
         super(e, code, message);
     }
 
-    public EntitlementUserApiException(ErrorCode code, Object...args) {
+    public EntitlementUserApiException(final ErrorCode code, final Object... args) {
         super(code, args);
     }
 }

diff --git a/api/src/main/java/com/ning/billing/entitlement/api/user/Subscription.java b/api/src/main/java/com/ning/billing/entitlement/api/user/Subscription.java
index 37f4ed8..e6f024c 100644
--- a/api/src/main/java/com/ning/billing/entitlement/api/user/Subscription.java
+++ b/api/src/main/java/com/ning/billing/entitlement/api/user/Subscription.java
@@ -35,16 +35,16 @@ import com.ning.billing.util.entity.Entity;
 public interface Subscription extends Entity, Blockable {
 
     public boolean cancel(DateTime requestedDate, boolean eot, CallContext context)
-    throws EntitlementUserApiException;
+            throws EntitlementUserApiException;
 
     public boolean uncancel(CallContext context)
-    throws EntitlementUserApiException;
+            throws EntitlementUserApiException;
 
     public boolean changePlan(String productName, BillingPeriod term, String planSet, DateTime requestedDate, CallContext context)
-    throws EntitlementUserApiException;
+            throws EntitlementUserApiException;
 
     public boolean recreate(PlanPhaseSpecifier spec, DateTime requestedDate, CallContext context)
-        throws EntitlementUserApiException;
+            throws EntitlementUserApiException;
 
     public enum SubscriptionState {
         ACTIVE,
@@ -74,6 +74,6 @@ public interface Subscription extends Entity, Blockable {
     public SubscriptionEvent getPendingTransition();
 
     public SubscriptionEvent getPreviousTransition();
-    
+
     public List<SubscriptionEvent> getBillingTransitions();
 }

diff --git a/api/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionBundle.java b/api/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionBundle.java
index fddb5e9..61c76ee 100644
--- a/api/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionBundle.java
+++ b/api/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionBundle.java
@@ -18,12 +18,11 @@ package com.ning.billing.entitlement.api.user;
 
 import java.util.UUID;
 
-import com.ning.billing.util.entity.Entity;
 import org.joda.time.DateTime;
 
 import com.ning.billing.junction.api.Blockable;
-import com.ning.billing.junction.api.BlockingState;
 import com.ning.billing.overdue.OverdueState;
+import com.ning.billing.util.entity.Entity;
 
 public interface SubscriptionBundle extends Blockable, Entity {
 
@@ -34,5 +33,5 @@ public interface SubscriptionBundle extends Blockable, Entity {
     public String getKey();
 
     public OverdueState<SubscriptionBundle> getOverdueState();
-    
+
 }

diff --git a/api/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionEvent.java b/api/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionEvent.java
index 2745c33..6d22268 100644
--- a/api/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionEvent.java
+++ b/api/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionEvent.java
@@ -20,13 +20,7 @@ import java.util.UUID;
 
 import org.joda.time.DateTime;
 
-import com.ning.billing.catalog.api.Plan;
-import com.ning.billing.catalog.api.PlanPhase;
-
 import com.ning.billing.entitlement.api.SubscriptionTransitionType;
-
-import com.ning.billing.catalog.api.PriceList;
-
 import com.ning.billing.entitlement.api.user.Subscription.SubscriptionState;
 import com.ning.billing.util.bus.BusEvent;
 
@@ -39,7 +33,7 @@ public interface SubscriptionEvent extends BusEvent {
     UUID getBundleId();
 
     UUID getSubscriptionId();
-    
+
     DateTime getSubscriptionStartDate();
 
     DateTime getRequestedTransitionTime();
@@ -61,9 +55,9 @@ public interface SubscriptionEvent extends BusEvent {
     SubscriptionState getNextState();
 
     String getNextPriceList();
-    
+
     Integer getRemainingEventsForUserOperation();
-    
+
     Long getTotalOrdering();
-    
+
 }

diff --git a/api/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionStatusDryRun.java b/api/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionStatusDryRun.java
index 36048fa..a659446 100644
--- a/api/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionStatusDryRun.java
+++ b/api/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionStatusDryRun.java
@@ -23,17 +23,17 @@ import com.ning.billing.catalog.api.PhaseType;
 public interface SubscriptionStatusDryRun {
 
     public UUID getId();
-    
+
     public String getProductName();
-    
+
     public BillingPeriod getBillingPeriod();
-    
+
     public String getPriceList();
-    
+
     public PhaseType getPhaseType();
 
     public DryRunChangeReason getReason();
-    
+
     public enum DryRunChangeReason {
         AO_INCLUDED_IN_NEW_PLAN,
         AO_NOT_AVAILABLE_IN_NEW_PLAN,

diff --git a/api/src/main/java/com/ning/billing/ErrorCode.java b/api/src/main/java/com/ning/billing/ErrorCode.java
index 5ceb670..2678afc 100644
--- a/api/src/main/java/com/ning/billing/ErrorCode.java
+++ b/api/src/main/java/com/ning/billing/ErrorCode.java
@@ -44,7 +44,7 @@ public enum ErrorCode {
     ENT_CHANGE_NON_ACTIVE(1021, "Subscription %s is in state %s: Failed to change plan"),
     ENT_CHANGE_FUTURE_CANCELLED(1022, "Subscription %s is future cancelled: Failed to change plan"),
     ENT_CHANGE_DRY_RUN_NOT_BP(1022, "Change DryRun API is only available for BP"),
-    
+
     /* Cancellation */
     ENT_CANCEL_BAD_STATE(1031, "Subscription %s is in state %s: Failed to cancel"),
     /* Recreation */
@@ -62,26 +62,26 @@ public enum ErrorCode {
 
     /* Repair */
     ENT_REPAIR_INVALID_DELETE_SET(1091, "Event %s is not deleted for subscription %s but prior events were"),
-    ENT_REPAIR_NON_EXISTENT_DELETE_EVENT(1092, "Event %s does not exist for subscription %s"),    
+    ENT_REPAIR_NON_EXISTENT_DELETE_EVENT(1092, "Event %s does not exist for subscription %s"),
     ENT_REPAIR_MISSING_AO_DELETE_EVENT(1093, "Event %s should be in deleted set for subscription %s because BP events got deleted earlier"),
     ENT_REPAIR_NEW_EVENT_BEFORE_LAST_BP_REMAINING(1094, "New event %s for subscription %s is before last remaining event for BP"),
     ENT_REPAIR_NEW_EVENT_BEFORE_LAST_AO_REMAINING(1095, "New event %s for subscription %s is before last remaining event"),
     ENT_REPAIR_UNKNOWN_TYPE(1096, "Unknown new event type %s for subscription %s"),
-    ENT_REPAIR_UNKNOWN_BUNDLE(1097, "Unknown bundle %s"), 
-    ENT_REPAIR_UNKNOWN_SUBSCRIPTION(1098, "Unknown subscription %s"),     
-    ENT_REPAIR_NO_ACTIVE_SUBSCRIPTIONS(1099, "No active subscriptions on bundle %s"),         
-    ENT_REPAIR_VIEW_CHANGED(1100, "View for bundle %s has changed from %s to %s"),             
-    ENT_REPAIR_SUB_RECREATE_NOT_EMPTY(1101, "Subscription %s with recreation for bundle %s should specify all existing events to be deleted"),    
-    ENT_REPAIR_SUB_EMPTY(1102, "Subscription %s with recreation for bundle %s should specify all existing events to be deleted"),    
-    ENT_REPAIR_BP_RECREATE_MISSING_AO(1103, "BP recreation for bundle %s implies repair all subscriptions"),    
-    ENT_REPAIR_BP_RECREATE_MISSING_AO_CREATE(1104, "BP recreation for bundle %s implies that all AO should be start also with a CREATE"),        
-    ENT_REPAIR_AO_CREATE_BEFORE_BP_START(1105, "Can't recreate AO %s for bundle %s before BP starts"),    
-    
-    
+    ENT_REPAIR_UNKNOWN_BUNDLE(1097, "Unknown bundle %s"),
+    ENT_REPAIR_UNKNOWN_SUBSCRIPTION(1098, "Unknown subscription %s"),
+    ENT_REPAIR_NO_ACTIVE_SUBSCRIPTIONS(1099, "No active subscriptions on bundle %s"),
+    ENT_REPAIR_VIEW_CHANGED(1100, "View for bundle %s has changed from %s to %s"),
+    ENT_REPAIR_SUB_RECREATE_NOT_EMPTY(1101, "Subscription %s with recreation for bundle %s should specify all existing events to be deleted"),
+    ENT_REPAIR_SUB_EMPTY(1102, "Subscription %s with recreation for bundle %s should specify all existing events to be deleted"),
+    ENT_REPAIR_BP_RECREATE_MISSING_AO(1103, "BP recreation for bundle %s implies repair all subscriptions"),
+    ENT_REPAIR_BP_RECREATE_MISSING_AO_CREATE(1104, "BP recreation for bundle %s implies that all AO should be start also with a CREATE"),
+    ENT_REPAIR_AO_CREATE_BEFORE_BP_START(1105, "Can't recreate AO %s for bundle %s before BP starts"),
+
+
     ENT_BUNDLE_IS_OVERDUE_BLOCKED(1090, "Changes to this bundle are blocked by overdue enforcement (%s :  %s)"),
     ENT_ACCOUNT_IS_OVERDUE_BLOCKED(1091, "Changes to this account are blocked by overdue enforcement (%s)"),
- 
-    
+
+
     /*
     *
     * Range 2000 : CATALOG
@@ -94,35 +94,35 @@ public enum ErrorCode {
 
     /* Plan change is disallowed by the catalog */
     CAT_ILLEGAL_CHANGE_REQUEST(2001, "Attempting to change plan from (product: '%s', billing period: '%s', " +
-    		"pricelist '%s') to (product: '%s', billing period: '%s', pricelist '%s'). This transition is not allowed by catalog rules"),
+            "pricelist '%s') to (product: '%s', billing period: '%s', pricelist '%s'). This transition is not allowed by catalog rules"),
 
-	/*
-	 * Price list
-	 */
+    /*
+      * Price list
+      */
 
-	/*Attempt to reference a price that is not present - should only happen if it is a currency not available in the catalog */
+    /*Attempt to reference a price that is not present - should only happen if it is a currency not available in the catalog */
     CAT_NO_PRICE_FOR_CURRENCY(2010, "This price does not have a value for the currency '%s'."),
 
     /* Price value explicitly set to NULL meaning there is no price available in that currency */
     CAT_PRICE_VALUE_NULL_FOR_CURRENCY(2011, "The value for the currency '%s' is NULL. This plan cannot be bought in this currency."),
-    CAT_NULL_PRICE_LIST_NAME(2012,"Price list name was null"),
+    CAT_NULL_PRICE_LIST_NAME(2012, "Price list name was null"),
     CAT_PRICE_LIST_NOT_FOUND(2013, "Could not find a pricelist with name '%s'"),
     /*
      * Plans
      */
-    CAT_PLAN_NOT_FOUND(2020,"Could not find a plan matching: (product: '%s', billing period: '%s', pricelist '%s')"),
-    CAT_NO_SUCH_PLAN(2021,"Could not find any plans named '%s'"),
+    CAT_PLAN_NOT_FOUND(2020, "Could not find a plan matching: (product: '%s', billing period: '%s', pricelist '%s')"),
+    CAT_NO_SUCH_PLAN(2021, "Could not find any plans named '%s'"),
 
     /*
      * Products
      */
-    CAT_NO_SUCH_PRODUCT(2030,"Could not find any product named '%s'"),
-    CAT_NULL_PRODUCT_NAME(2031,"Product name was null"),
+    CAT_NO_SUCH_PRODUCT(2030, "Could not find any product named '%s'"),
+    CAT_NULL_PRODUCT_NAME(2031, "Product name was null"),
     /*
      * Phases
      */
-    CAT_NO_SUCH_PHASE(2040,"Could not find any phases named '%s'"),
-    CAT_BAD_PHASE_NAME(2041,"Bad phase name '%s'"),
+    CAT_NO_SUCH_PHASE(2040, "Could not find any phases named '%s'"),
+    CAT_BAD_PHASE_NAME(2041, "Bad phase name '%s'"),
     /*
      * Versioned Catalog
      */
@@ -139,7 +139,7 @@ public enum ErrorCode {
     CAT_NO_SUCH_OVEDUE_STATE(2070, "No such overdue state '%s'"),
     CAT_MISSING_CLEAR_STATE(2071, "Missing a clear state"),
     CAT_NO_OVERDUEABLE_TYPE(2072, "No such overdueable type: "),
-   /*
+    /*
     *
     * Range 3000 : ACCOUNT
     *
@@ -153,7 +153,7 @@ public enum ErrorCode {
     ACCOUNT_CREATION_FAILED(3006, "Account creation failed."),
     ACCOUNT_UPDATE_FAILED(3007, "Account update failed."),
 
-   /*
+    /*
     *
     * Range 3900: Tag definitions
     *
@@ -162,17 +162,17 @@ public enum ErrorCode {
     TAG_DEFINITION_ALREADY_EXISTS(3901, "The tag definition name already exists (name: %s)"),
     TAG_DEFINITION_DOES_NOT_EXIST(3902, "The tag definition name does not exist (name: %s)"),
     TAG_DEFINITION_IN_USE(3903, "The tag definition name is currently in use (name: %s)"),
-    
+
     CONTROL_TAG_DOES_NOT_EXIST(3904, "The control tag does not exist (name: %s)"),
 
-   /*
+    /*
     *
     * Range 3950: Tags
     *
     */
     TAG_DOES_NOT_EXIST(3950, "The tag does not exist (name: %s)"),
 
-   /*
+    /*
     *
     * Range 4000: INVOICE
     *
@@ -198,9 +198,9 @@ public enum ErrorCode {
      * Range 5000: Overdue system
      * 
      */
-    OVERDUE_CAT_ERROR_ENCOUNTERED(5001,"Catalog error encountered on Overdueable: id='%s', type='%s'"),  
-    OVERDUE_TYPE_NOT_SUPPORTED(5002,"Overdue of this type is not supported: id='%s', type='%s'"),  
-    OVERDUE_NO_REEVALUATION_INTERVAL(5003,"No valid reevaluation interval for state (name: %s)"),
+    OVERDUE_CAT_ERROR_ENCOUNTERED(5001, "Catalog error encountered on Overdueable: id='%s', type='%s'"),
+    OVERDUE_TYPE_NOT_SUPPORTED(5002, "Overdue of this type is not supported: id='%s', type='%s'"),
+    OVERDUE_NO_REEVALUATION_INTERVAL(5003, "No valid reevaluation interval for state (name: %s)"),
     OVERDUE_NOT_CONFIGURED(5004, "No configuration was found for the overdue system"),
     /*
      * 
@@ -209,40 +209,40 @@ public enum ErrorCode {
      */
     BLOCK_BLOCKED_ACTION(6000, "The action %s is block on this %s with id=%s"),
     BLOCK_TYPE_NOT_SUPPORTED(6001, "The Blockable type '%s' is not supported"),
-    
-    
+
+
     /*
-     * Range 7000 : Payment
-     */
-    
+    * Range 7000 : Payment
+    */
+
     PAYMENT_NO_SUCH_PAYMENT_METHOD(7000, "Payment method for account %s, and paymentId %s does not exist"),
     PAYMENT_NO_PAYMENT_METHODS(7001, "Payment methods for account %s don't exist"),
     PAYMENT_UPD_GATEWAY_FAILED(7002, "Failed to update payment gateway for account %s : %s"),
-    PAYMENT_GET_PAYMENT_PROVIDER(7003, "Failed to retrieve payment provider for account %s : %s"),    
-    PAYMENT_GET_PAYMENT_METHODS(7004, "Failed to retrieve payment method for account %s : %s"),        
-    PAYMENT_ADD_PAYMENT_METHOD(7005, "Failed to add payment method for account %s : %s"),        
-    PAYMENT_REFRESH_PAYMENT_METHOD(7006, "Failed to resfresh payment methods for account %s : %s"),            
-    PAYMENT_DEL_PAYMENT_METHOD(7007, "Failed to delete payment method for account %s : %s"),        
-    PAYMENT_UPD_PAYMENT_METHOD(7008, "Failed to update payment method for account %s : %s"),            
-    PAYMENT_CREATE_PAYMENT(7009, "Failed to create payment for account %s : %s"),                
-    PAYMENT_CREATE_PAYMENT_FOR_ATTEMPT(70010, "Failed to create payment for account %s and attempt %s : %s"),                    
-    PAYMENT_CREATE_PAYMENT_FOR_ATTEMPT_WITH_NON_POSITIVE_INV(7011, "Got payment attempt with negative or null invoice for account %s"),                        
-    PAYMENT_CREATE_PAYMENT_FOR_ATTEMPT_BAD(7012, "Failed to create payment for attempts %s "),                    
-    PAYMENT_CREATE_PAYMENT_PROVIDER_ACCOUNT(7013, "Failed to create payment provider account for account %s : %s"),                
+    PAYMENT_GET_PAYMENT_PROVIDER(7003, "Failed to retrieve payment provider for account %s : %s"),
+    PAYMENT_GET_PAYMENT_METHODS(7004, "Failed to retrieve payment method for account %s : %s"),
+    PAYMENT_ADD_PAYMENT_METHOD(7005, "Failed to add payment method for account %s : %s"),
+    PAYMENT_REFRESH_PAYMENT_METHOD(7006, "Failed to resfresh payment methods for account %s : %s"),
+    PAYMENT_DEL_PAYMENT_METHOD(7007, "Failed to delete payment method for account %s : %s"),
+    PAYMENT_UPD_PAYMENT_METHOD(7008, "Failed to update payment method for account %s : %s"),
+    PAYMENT_CREATE_PAYMENT(7009, "Failed to create payment for account %s : %s"),
+    PAYMENT_CREATE_PAYMENT_FOR_ATTEMPT(70010, "Failed to create payment for account %s and attempt %s : %s"),
+    PAYMENT_CREATE_PAYMENT_FOR_ATTEMPT_WITH_NON_POSITIVE_INV(7011, "Got payment attempt with negative or null invoice for account %s"),
+    PAYMENT_CREATE_PAYMENT_FOR_ATTEMPT_BAD(7012, "Failed to create payment for attempts %s "),
+    PAYMENT_CREATE_PAYMENT_PROVIDER_ACCOUNT(7013, "Failed to create payment provider account for account %s : %s"),
     PAYMENT_UPD_PAYMENT_PROVIDER_ACCOUNT(7014, "Failed to update payment provider account for account %s : %s"),
-    PAYMENT_GET_PAYMENT_PROVIDER_ACCOUNT(7015, "Failed to retrieve payment provider account for account %s : %s"),                        
-    PAYMENT_CREATE_REFUND(7016, "Failed to create refund for account %s : %s"),                
-    PAYMENT_NULL_INVOICE(7017, "Invoice %s has a balance <= 0 "),      
-    PAYMENT_AMOUNT_DENIED(7018, "Payment amount requested for invoice %s is greater than invoice balance [%f/%f]"),         
+    PAYMENT_GET_PAYMENT_PROVIDER_ACCOUNT(7015, "Failed to retrieve payment provider account for account %s : %s"),
+    PAYMENT_CREATE_REFUND(7016, "Failed to create refund for account %s : %s"),
+    PAYMENT_NULL_INVOICE(7017, "Invoice %s has a balance <= 0 "),
+    PAYMENT_AMOUNT_DENIED(7018, "Payment amount requested for invoice %s is greater than invoice balance [%f/%f]"),
     PAYMENT_INTERNAL_ERROR(7019, "Internal payment error : %s"),
     PAYMENT_NO_SUCH_PAYMENT(7020, "Payment %s does not exist"),
     PAYMENT_NO_DEFAULT_PAYMENT_METHOD(7021, "Account %s does not have a default payment method set"),
-    PAYMENT_DEL_DEFAULT_PAYMENT_METHOD(7022, "Cannot delete default payment method for account %s"),            
+    PAYMENT_DEL_DEFAULT_PAYMENT_METHOD(7022, "Cannot delete default payment method for account %s"),
+
+    PAYMENT_PLUGIN_TIMEOUT(7100, "Plugin timeout for account %s and invoice %s"),
+    PAYMENT_PLUGIN_ACCOUNT_INIT(7101, "Account initialization for account %s and plugin % s failed: %s"),
 
-    PAYMENT_PLUGIN_TIMEOUT(7100, "Plugin timeout for account %s and invoice %s"),    
-    PAYMENT_PLUGIN_ACCOUNT_INIT(7101, "Account initialization for account %s and plugin % s failed: %s"),        
 
-    
     /*
     *
     * Range 9000: Miscellaneous
@@ -253,11 +253,11 @@ public enum ErrorCode {
     MISSING_TRANSLATION_RESOURCE(9010, "The resources for %s translation could not be found."),
     MISSING_DEFAULT_TRANSLATION_RESOURCE(9011, "The default resource for %s translation could not be found.");
 
-    
-    private int code;
-    private String format;
 
-    ErrorCode(int code, String format) {
+    private final int code;
+    private final String format;
+
+    ErrorCode(final int code, final String format) {
         this.code = code;
         this.format = format;
     }

diff --git a/api/src/main/java/com/ning/billing/glue/JunctionModule.java b/api/src/main/java/com/ning/billing/glue/JunctionModule.java
index 413e99c..16ea788 100644
--- a/api/src/main/java/com/ning/billing/glue/JunctionModule.java
+++ b/api/src/main/java/com/ning/billing/glue/JunctionModule.java
@@ -20,10 +20,10 @@ package com.ning.billing.glue;
 public interface JunctionModule {
 
     public void installBillingApi();
-   
-    public void installAccountUserApi() ;
-    
-    public void installBlockingApi() ;
+
+    public void installAccountUserApi();
+
+    public void installBlockingApi();
 
     public void installEntitlementUserApi();
 

diff --git a/api/src/main/java/com/ning/billing/invoice/api/formatters/InvoiceFormatterFactory.java b/api/src/main/java/com/ning/billing/invoice/api/formatters/InvoiceFormatterFactory.java
index af4af92..eb1d8b8 100644
--- a/api/src/main/java/com/ning/billing/invoice/api/formatters/InvoiceFormatterFactory.java
+++ b/api/src/main/java/com/ning/billing/invoice/api/formatters/InvoiceFormatterFactory.java
@@ -16,11 +16,11 @@
 
 package com.ning.billing.invoice.api.formatters;
 
+import java.util.Locale;
+
 import com.ning.billing.invoice.api.Invoice;
 import com.ning.billing.util.template.translation.TranslatorConfig;
 
-import java.util.Locale;
-
 public interface InvoiceFormatterFactory {
     public InvoiceFormatter createInvoiceFormatter(TranslatorConfig config, Invoice invoice, Locale locale);
 }

diff --git a/api/src/main/java/com/ning/billing/invoice/api/formatters/InvoiceItemFormatter.java b/api/src/main/java/com/ning/billing/invoice/api/formatters/InvoiceItemFormatter.java
index c14e621..7175fde 100644
--- a/api/src/main/java/com/ning/billing/invoice/api/formatters/InvoiceItemFormatter.java
+++ b/api/src/main/java/com/ning/billing/invoice/api/formatters/InvoiceItemFormatter.java
@@ -20,5 +20,6 @@ import com.ning.billing.invoice.api.InvoiceItem;
 
 public interface InvoiceItemFormatter extends InvoiceItem {
     public String getFormattedStartDate();
+
     public String getFormattedEndDate();
 }

diff --git a/api/src/main/java/com/ning/billing/invoice/api/Invoice.java b/api/src/main/java/com/ning/billing/invoice/api/Invoice.java
index bf7fd7b..8fbf0cf 100644
--- a/api/src/main/java/com/ning/billing/invoice/api/Invoice.java
+++ b/api/src/main/java/com/ning/billing/invoice/api/Invoice.java
@@ -16,14 +16,15 @@
 
 package com.ning.billing.invoice.api;
 
-import com.ning.billing.catalog.api.Currency;
-import com.ning.billing.util.entity.Entity;
-import org.joda.time.DateTime;
-
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.UUID;
 
+import org.joda.time.DateTime;
+
+import com.ning.billing.catalog.api.Currency;
+import com.ning.billing.util.entity.Entity;
+
 public interface Invoice extends Entity {
     boolean addInvoiceItem(InvoiceItem item);
 
@@ -65,5 +66,5 @@ public interface Invoice extends Entity {
 
     boolean isDueForPayment(DateTime targetDate, int numberOfDays);
 
-	boolean isMigrationInvoice();
+    boolean isMigrationInvoice();
 }

diff --git a/api/src/main/java/com/ning/billing/invoice/api/InvoiceApiException.java b/api/src/main/java/com/ning/billing/invoice/api/InvoiceApiException.java
index a9275e8..087c16e 100644
--- a/api/src/main/java/com/ning/billing/invoice/api/InvoiceApiException.java
+++ b/api/src/main/java/com/ning/billing/invoice/api/InvoiceApiException.java
@@ -20,15 +20,15 @@ import com.ning.billing.BillingExceptionBase;
 import com.ning.billing.ErrorCode;
 
 public class InvoiceApiException extends BillingExceptionBase {
-    public InvoiceApiException(Throwable cause, int code, final String msg) {
+    public InvoiceApiException(final Throwable cause, final int code, final String msg) {
         super(cause, code, msg);
     }
 
-    public InvoiceApiException(Throwable cause, ErrorCode code, final Object... args) {
+    public InvoiceApiException(final Throwable cause, final ErrorCode code, final Object... args) {
         super(cause, code, args);
     }
 
-    public InvoiceApiException(ErrorCode code, final Object... args) {
+    public InvoiceApiException(final ErrorCode code, final Object... args) {
         super(code, args);
     }
 }

diff --git a/api/src/main/java/com/ning/billing/invoice/api/InvoiceCreationEvent.java b/api/src/main/java/com/ning/billing/invoice/api/InvoiceCreationEvent.java
index 2561c8b..0385827 100644
--- a/api/src/main/java/com/ning/billing/invoice/api/InvoiceCreationEvent.java
+++ b/api/src/main/java/com/ning/billing/invoice/api/InvoiceCreationEvent.java
@@ -26,9 +26,13 @@ import com.ning.billing.util.bus.BusEvent;
 
 public interface InvoiceCreationEvent extends BusEvent {
     public UUID getInvoiceId();
+
     public UUID getAccountId();
+
     public BigDecimal getAmountOwed();
+
     public Currency getCurrency();
+
     public DateTime getInvoiceCreationDate();
 
-}
\ No newline at end of file
+}

diff --git a/api/src/main/java/com/ning/billing/invoice/api/InvoiceItem.java b/api/src/main/java/com/ning/billing/invoice/api/InvoiceItem.java
index 9f898c7..ca7f7af 100644
--- a/api/src/main/java/com/ning/billing/invoice/api/InvoiceItem.java
+++ b/api/src/main/java/com/ning/billing/invoice/api/InvoiceItem.java
@@ -16,13 +16,14 @@
 
 package com.ning.billing.invoice.api;
 
-import com.ning.billing.catalog.api.Currency;
-import com.ning.billing.util.entity.Entity;
-import org.joda.time.DateTime;
-
 import java.math.BigDecimal;
 import java.util.UUID;
 
+import org.joda.time.DateTime;
+
+import com.ning.billing.catalog.api.Currency;
+import com.ning.billing.util.entity.Entity;
+
 public interface InvoiceItem extends Entity, Comparable<InvoiceItem> {
     UUID getInvoiceId();
 

diff --git a/api/src/main/java/com/ning/billing/invoice/api/InvoiceMigrationApi.java b/api/src/main/java/com/ning/billing/invoice/api/InvoiceMigrationApi.java
index 8e17007..c1d4490 100644
--- a/api/src/main/java/com/ning/billing/invoice/api/InvoiceMigrationApi.java
+++ b/api/src/main/java/com/ning/billing/invoice/api/InvoiceMigrationApi.java
@@ -26,15 +26,14 @@ import com.ning.billing.catalog.api.Currency;
 public interface InvoiceMigrationApi {
 
 
-	/**
-	 * @param accountId
-	 * @param targetDate
-	 * @param balance
-	 * @param currency
-	 * 
-	 * @return The UUID of the created invoice
-	 */
-	public UUID createMigrationInvoice(UUID accountId, DateTime targetDate,
-			BigDecimal balance, Currency currency);
+    /**
+     * @param accountId
+     * @param targetDate
+     * @param balance
+     * @param currency
+     * @return The UUID of the created invoice
+     */
+    public UUID createMigrationInvoice(UUID accountId, DateTime targetDate,
+                                       BigDecimal balance, Currency currency);
 
 }

diff --git a/api/src/main/java/com/ning/billing/invoice/api/InvoiceNotifier.java b/api/src/main/java/com/ning/billing/invoice/api/InvoiceNotifier.java
index cd0b7b6..d335a71 100644
--- a/api/src/main/java/com/ning/billing/invoice/api/InvoiceNotifier.java
+++ b/api/src/main/java/com/ning/billing/invoice/api/InvoiceNotifier.java
@@ -16,11 +16,8 @@
 
 package com.ning.billing.invoice.api;
 
-import com.ning.billing.BillingExceptionBase;
 import com.ning.billing.account.api.Account;
 
-import java.io.IOException;
-
 public interface InvoiceNotifier {
     public void notify(Account account, Invoice invoice) throws InvoiceApiException;
 }

diff --git a/api/src/main/java/com/ning/billing/invoice/api/InvoicePayment.java b/api/src/main/java/com/ning/billing/invoice/api/InvoicePayment.java
index 4ba42c1..4a04248 100644
--- a/api/src/main/java/com/ning/billing/invoice/api/InvoicePayment.java
+++ b/api/src/main/java/com/ning/billing/invoice/api/InvoicePayment.java
@@ -18,7 +18,9 @@ package com.ning.billing.invoice.api;
 
 import java.math.BigDecimal;
 import java.util.UUID;
+
 import org.joda.time.DateTime;
+
 import com.ning.billing.catalog.api.Currency;
 import com.ning.billing.util.entity.Entity;
 

diff --git a/api/src/main/java/com/ning/billing/invoice/api/InvoicePaymentApi.java b/api/src/main/java/com/ning/billing/invoice/api/InvoicePaymentApi.java
index ecc477b..646a198 100644
--- a/api/src/main/java/com/ning/billing/invoice/api/InvoicePaymentApi.java
+++ b/api/src/main/java/com/ning/billing/invoice/api/InvoicePaymentApi.java
@@ -20,10 +20,10 @@ import java.math.BigDecimal;
 import java.util.List;
 import java.util.UUID;
 
-import com.ning.billing.util.callcontext.CallContext;
 import org.joda.time.DateTime;
 
 import com.ning.billing.catalog.api.Currency;
+import com.ning.billing.util.callcontext.CallContext;
 
 public interface InvoicePaymentApi {
     /**
@@ -41,7 +41,7 @@ public interface InvoicePaymentApi {
     public void notifyOfPaymentAttempt(InvoicePayment invoicePayment, CallContext context);
 
     public void notifyOfPaymentAttempt(UUID invoiceId, BigDecimal amountOutstanding, Currency currency, UUID paymentAttemptId, DateTime paymentAttemptDate, CallContext context);
-    
+
     public void notifyOfPaymentAttempt(UUID invoiceId, UUID paymentAttemptId, DateTime paymentAttemptDate, CallContext context);
 
     public void processChargeback(UUID invoicePaymentId, BigDecimal amount, CallContext context) throws InvoiceApiException;

diff --git a/api/src/main/java/com/ning/billing/invoice/api/InvoiceUserApi.java b/api/src/main/java/com/ning/billing/invoice/api/InvoiceUserApi.java
index 1b8afb3..0414c25 100644
--- a/api/src/main/java/com/ning/billing/invoice/api/InvoiceUserApi.java
+++ b/api/src/main/java/com/ning/billing/invoice/api/InvoiceUserApi.java
@@ -16,16 +16,17 @@
 
 package com.ning.billing.invoice.api;
 
-import com.ning.billing.catalog.api.Currency;
-import com.ning.billing.util.api.TagApiException;
-import com.ning.billing.util.callcontext.CallContext;
-import org.joda.time.DateTime;
-
 import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.List;
 import java.util.UUID;
 
+import org.joda.time.DateTime;
+
+import com.ning.billing.catalog.api.Currency;
+import com.ning.billing.util.api.TagApiException;
+import com.ning.billing.util.callcontext.CallContext;
+
 public interface InvoiceUserApi {
     public List<Invoice> getInvoicesByAccount(UUID accountId);
 
@@ -38,7 +39,7 @@ public interface InvoiceUserApi {
     public void notifyOfPaymentAttempt(InvoicePayment invoicePayment, CallContext context);
 
     public Collection<Invoice> getUnpaidInvoicesByAccountId(UUID accountId, DateTime upToDate);
-    
+
     public Invoice triggerInvoiceGeneration(UUID accountId, DateTime targetDate, boolean dryRun, CallContext context) throws InvoiceApiException;
 
     public void tagInvoiceAsWrittenOff(UUID invoiceId, CallContext context) throws TagApiException;
@@ -47,6 +48,6 @@ public interface InvoiceUserApi {
 
     public InvoiceItem getCreditById(UUID creditId) throws InvoiceApiException;
 
-    public InvoiceItem insertCredit( UUID accountId,  BigDecimal amount,  DateTime effectiveDate,
-                              Currency currency,  CallContext context) throws InvoiceApiException;
+    public InvoiceItem insertCredit(UUID accountId, BigDecimal amount, DateTime effectiveDate,
+                                    Currency currency, CallContext context) throws InvoiceApiException;
 }

diff --git a/api/src/main/java/com/ning/billing/junction/api/BillingApi.java b/api/src/main/java/com/ning/billing/junction/api/BillingApi.java
index bb38e8d..6a2c665 100644
--- a/api/src/main/java/com/ning/billing/junction/api/BillingApi.java
+++ b/api/src/main/java/com/ning/billing/junction/api/BillingApi.java
@@ -22,10 +22,8 @@ import com.ning.billing.entitlement.api.billing.ChargeThruApi;
 
 public interface BillingApi extends ChargeThruApi {
     /**
-     *
-     * @param accountId 
+     * @param accountId
      * @return an ordered list of billing event for the given accounts
-     *
      */
     public BillingEventSet getBillingEventsForAccountAndUpdateAccountBCD(UUID accountId);
 }

diff --git a/api/src/main/java/com/ning/billing/junction/api/BillingEventSet.java b/api/src/main/java/com/ning/billing/junction/api/BillingEventSet.java
index aed5c6a..66f604d 100644
--- a/api/src/main/java/com/ning/billing/junction/api/BillingEventSet.java
+++ b/api/src/main/java/com/ning/billing/junction/api/BillingEventSet.java
@@ -27,7 +27,7 @@ public interface BillingEventSet extends SortedSet<BillingEvent> {
     public abstract boolean isAccountAutoInvoiceOff();
 
     public abstract List<UUID> getSubscriptionIdsWithAutoInvoiceOff();
-    
+
     public boolean isLast(BillingEvent event);
 
-}
\ No newline at end of file
+}

diff --git a/api/src/main/java/com/ning/billing/junction/api/Blockable.java b/api/src/main/java/com/ning/billing/junction/api/Blockable.java
index 39900cc..73be651 100644
--- a/api/src/main/java/com/ning/billing/junction/api/Blockable.java
+++ b/api/src/main/java/com/ning/billing/junction/api/Blockable.java
@@ -29,19 +29,19 @@ public interface Blockable {
         ACCOUNT,
         SUBSCRIPTION_BUNDLE,
         SUBSCRIPTION;
-        
-        public static Type get(Blockable o) throws BlockingApiException{
-            if (o instanceof Account){
+
+        public static Type get(final Blockable o) throws BlockingApiException {
+            if (o instanceof Account) {
                 return ACCOUNT;
-            } else if (o instanceof SubscriptionBundle){
+            } else if (o instanceof SubscriptionBundle) {
                 return SUBSCRIPTION_BUNDLE;
-            } else if (o instanceof Subscription){
+            } else if (o instanceof Subscription) {
                 return SUBSCRIPTION;
             }
-            throw new BlockingApiException(ErrorCode.BLOCK_TYPE_NOT_SUPPORTED , o.getClass().getName());
+            throw new BlockingApiException(ErrorCode.BLOCK_TYPE_NOT_SUPPORTED, o.getClass().getName());
         }
-        
-        public static Type get(String type) throws BlockingApiException {
+
+        public static Type get(final String type) throws BlockingApiException {
             if (type.equalsIgnoreCase(ACCOUNT.name())) {
                 return ACCOUNT;
             } else if (type.equalsIgnoreCase(SUBSCRIPTION_BUNDLE.name())) {
@@ -49,12 +49,12 @@ public interface Blockable {
             } else if (type.equalsIgnoreCase(SUBSCRIPTION.name())) {
                 return SUBSCRIPTION;
             }
-            throw new BlockingApiException(ErrorCode.BLOCK_TYPE_NOT_SUPPORTED , type);
+            throw new BlockingApiException(ErrorCode.BLOCK_TYPE_NOT_SUPPORTED, type);
         }
 
     }
 
     public UUID getId();
-    
+
     public BlockingState getBlockingState();
 }

diff --git a/api/src/main/java/com/ning/billing/junction/api/BlockingApi.java b/api/src/main/java/com/ning/billing/junction/api/BlockingApi.java
index d7fc678..d6a1de6 100644
--- a/api/src/main/java/com/ning/billing/junction/api/BlockingApi.java
+++ b/api/src/main/java/com/ning/billing/junction/api/BlockingApi.java
@@ -26,11 +26,11 @@ public interface BlockingApi {
     public BlockingState getBlockingStateFor(Blockable overdueable);
 
     public BlockingState getBlockingStateFor(UUID overdueableId);
-    
+
     public SortedSet<BlockingState> getBlockingHistory(Blockable overdueable);
 
     public SortedSet<BlockingState> getBlockingHistory(UUID overdueableId);
-    
-    public <T extends Blockable> void  setBlockingState(BlockingState state);
-    
+
+    public <T extends Blockable> void setBlockingState(BlockingState state);
+
 }

diff --git a/api/src/main/java/com/ning/billing/junction/api/BlockingApiException.java b/api/src/main/java/com/ning/billing/junction/api/BlockingApiException.java
index 3a7a6c5..0a53790 100644
--- a/api/src/main/java/com/ning/billing/junction/api/BlockingApiException.java
+++ b/api/src/main/java/com/ning/billing/junction/api/BlockingApiException.java
@@ -20,14 +20,14 @@ import com.ning.billing.BillingExceptionBase;
 import com.ning.billing.ErrorCode;
 
 public class BlockingApiException extends BillingExceptionBase {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	public BlockingApiException(Throwable cause, ErrorCode code, Object... args) {
-		super(cause, code, args);
-	}
+    public BlockingApiException(final Throwable cause, final ErrorCode code, final Object... args) {
+        super(cause, code, args);
+    }
 
-	public BlockingApiException(ErrorCode code, Object... args) {
-		super(code, args);
-	}
+    public BlockingApiException(final ErrorCode code, final Object... args) {
+        super(code, args);
+    }
 
 }

diff --git a/api/src/main/java/com/ning/billing/junction/api/BlockingState.java b/api/src/main/java/com/ning/billing/junction/api/BlockingState.java
index 08202a2..577ba15 100644
--- a/api/src/main/java/com/ning/billing/junction/api/BlockingState.java
+++ b/api/src/main/java/com/ning/billing/junction/api/BlockingState.java
@@ -21,7 +21,7 @@ import org.joda.time.DateTime;
 public interface BlockingState extends Comparable<BlockingState> {
 
     public abstract String getStateName();
-    
+
     public abstract Blockable.Type getType();
 
     public abstract DateTime getTimestamp();
@@ -39,4 +39,4 @@ public interface BlockingState extends Comparable<BlockingState> {
     public abstract String getDescription();
 
     public abstract String toString();
-}
\ No newline at end of file
+}

diff --git a/api/src/main/java/com/ning/billing/junction/api/DefaultBlockingState.java b/api/src/main/java/com/ning/billing/junction/api/DefaultBlockingState.java
index 332cb85..5a179c6 100644
--- a/api/src/main/java/com/ning/billing/junction/api/DefaultBlockingState.java
+++ b/api/src/main/java/com/ning/billing/junction/api/DefaultBlockingState.java
@@ -21,10 +21,10 @@ import java.util.UUID;
 import org.joda.time.DateTime;
 
 
-public class DefaultBlockingState implements BlockingState{
+public class DefaultBlockingState implements BlockingState {
+
+    private static BlockingState clearState = null;
 
-    private static BlockingState clearState= null;
-    
     private final UUID blockingId;
     private final Blockable.Type type;
     private final String stateName;
@@ -33,41 +33,41 @@ public class DefaultBlockingState implements BlockingState{
     private final boolean blockEntitlement;
     private final boolean blockBilling;
     private final DateTime timestamp;
-    
+
     public static BlockingState getClearState() {
-        if(clearState == null) {
+        if (clearState == null) {
             clearState = new DefaultBlockingState(null, BlockingApi.CLEAR_STATE_NAME, null, null, false, false, false);
         }
         return clearState;
-    }    
-    
-    public DefaultBlockingState(UUID blockingId, 
-            String stateName, 
-            Blockable.Type type, 
-            String service,
-            boolean blockChange,
-            boolean blockEntitlement,
-            boolean blockBilling
-            ) {
-        this(   blockingId, 
-                 stateName, 
-                 type, 
-                 service,
-                 blockChange,
-                 blockEntitlement,
-                 blockBilling,
-                 null);
-    }    
-    
-    public DefaultBlockingState(UUID blockingId, 
-            String stateName, 
-            Blockable.Type type, 
-            String service,
-            boolean blockChange,
-            boolean blockEntitlement,
-            boolean blockBilling,
-            DateTime timestamp
-            ) {
+    }
+
+    public DefaultBlockingState(final UUID blockingId,
+                                final String stateName,
+                                final Blockable.Type type,
+                                final String service,
+                                final boolean blockChange,
+                                final boolean blockEntitlement,
+                                final boolean blockBilling
+                               ) {
+        this(blockingId,
+             stateName,
+             type,
+             service,
+             blockChange,
+             blockEntitlement,
+             blockBilling,
+             null);
+    }
+
+    public DefaultBlockingState(final UUID blockingId,
+                                final String stateName,
+                                final Blockable.Type type,
+                                final String service,
+                                final boolean blockChange,
+                                final boolean blockEntitlement,
+                                final boolean blockBilling,
+                                final DateTime timestamp
+                               ) {
         super();
         this.blockingId = blockingId;
         this.stateName = stateName;
@@ -78,13 +78,14 @@ public class DefaultBlockingState implements BlockingState{
         this.type = type;
         this.timestamp = timestamp;
     }
-    
+
     public UUID getBlockedId() {
         return blockingId;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.junction.api.blocking.BlockingState#getStateName()
-     */
+    * @see com.ning.billing.junction.api.blocking.BlockingState#getStateName()
+    */
     @Override
     public String getStateName() {
         return stateName;
@@ -94,9 +95,10 @@ public class DefaultBlockingState implements BlockingState{
     public Blockable.Type getType() {
         return type;
     }
+
     /* (non-Javadoc)
-     * @see com.ning.billing.junction.api.blocking.BlockingState#getTimestamp()
-     */
+    * @see com.ning.billing.junction.api.blocking.BlockingState#getTimestamp()
+    */
     @Override
     public DateTime getTimestamp() {
         return timestamp;
@@ -133,7 +135,7 @@ public class DefaultBlockingState implements BlockingState{
     /* (non-Javadoc)
      * @see com.ning.billing.junction.api.blocking.BlockingState#compareTo(com.ning.billing.junction.api.blocking.DefaultBlockingState)
      */
-    public int compareTo(BlockingState arg0) {
+    public int compareTo(final BlockingState arg0) {
         if (timestamp.compareTo(arg0.getTimestamp()) != 0) {
             return timestamp.compareTo(arg0.getTimestamp());
         } else {
@@ -157,59 +159,74 @@ public class DefaultBlockingState implements BlockingState{
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
+    public boolean equals(final Object obj) {
+        if (this == obj) {
             return true;
-        if (obj == null)
+        }
+        if (obj == null) {
             return false;
-        if (getClass() != obj.getClass())
+        }
+        if (getClass() != obj.getClass()) {
             return false;
-        DefaultBlockingState other = (DefaultBlockingState) obj;
-        if (blockBilling != other.blockBilling)
+        }
+        final DefaultBlockingState other = (DefaultBlockingState) obj;
+        if (blockBilling != other.blockBilling) {
             return false;
-        if (blockChange != other.blockChange)
+        }
+        if (blockChange != other.blockChange) {
             return false;
-        if (blockEntitlement != other.blockEntitlement)
+        }
+        if (blockEntitlement != other.blockEntitlement) {
             return false;
+        }
         if (blockingId == null) {
-            if (other.blockingId != null)
+            if (other.blockingId != null) {
                 return false;
-        } else if (!blockingId.equals(other.blockingId))
+            }
+        } else if (!blockingId.equals(other.blockingId)) {
             return false;
+        }
         if (service == null) {
-            if (other.service != null)
+            if (other.service != null) {
                 return false;
-        } else if (!service.equals(other.service))
+            }
+        } else if (!service.equals(other.service)) {
             return false;
+        }
         if (stateName == null) {
-            if (other.stateName != null)
+            if (other.stateName != null) {
                 return false;
-        } else if (!stateName.equals(other.stateName))
+            }
+        } else if (!stateName.equals(other.stateName)) {
             return false;
+        }
         if (timestamp == null) {
-            if (other.timestamp != null)
+            if (other.timestamp != null) {
                 return false;
-        } else if (!timestamp.equals(other.timestamp))
+            }
+        } else if (!timestamp.equals(other.timestamp)) {
             return false;
-        if (type != other.type)
+        }
+        if (type != other.type) {
             return false;
+        }
         return true;
     }
-    
+
     /* (non-Javadoc)
-     * @see com.ning.billing.junction.api.blocking.BlockingState#getDescription()
-     */
+    * @see com.ning.billing.junction.api.blocking.BlockingState#getDescription()
+    */
     @Override
     public String getDescription() {
-        String entitlement = onOff(isBlockEntitlement());
-        String billing = onOff(isBlockBilling());
-        String change = onOff(isBlockChange());
-               
+        final String entitlement = onOff(isBlockEntitlement());
+        final String billing = onOff(isBlockBilling());
+        final String change = onOff(isBlockChange());
+
         return String.format("(Change: %s, Entitlement: %s, Billing: %s)", change, entitlement, billing);
     }
-    
-    private String onOff(boolean val) {
-        if(val) {
+
+    private String onOff(final boolean val) {
+        if (val) {
             return "Off";
         } else {
             return "On";
@@ -224,5 +241,4 @@ public class DefaultBlockingState implements BlockingState{
     }
 
 
-    
 }

diff --git a/api/src/main/java/com/ning/billing/lifecycle/KillbillService.java b/api/src/main/java/com/ning/billing/lifecycle/KillbillService.java
index 84e1ab6..df00532 100644
--- a/api/src/main/java/com/ning/billing/lifecycle/KillbillService.java
+++ b/api/src/main/java/com/ning/billing/lifecycle/KillbillService.java
@@ -18,7 +18,7 @@ package com.ning.billing.lifecycle;
 
 public interface KillbillService {
 
-    public static class ServiceException extends Exception  {
+    public static class ServiceException extends Exception {
 
         private static final long serialVersionUID = 176191207L;
 
@@ -26,21 +26,20 @@ public interface KillbillService {
             super();
         }
 
-        public ServiceException(String msg, Throwable e) {
+        public ServiceException(final String msg, final Throwable e) {
             super(msg, e);
         }
 
-        public ServiceException(String msg) {
+        public ServiceException(final String msg) {
             super(msg);
         }
 
-        public ServiceException(Throwable msg) {
+        public ServiceException(final Throwable msg) {
             super(msg);
         }
     }
 
     /**
-     *
      * @return the name of the service
      */
     public String getName();

diff --git a/api/src/main/java/com/ning/billing/lifecycle/LifecycleHandlerType.java b/api/src/main/java/com/ning/billing/lifecycle/LifecycleHandlerType.java
index 759cc13..bb86365 100644
--- a/api/src/main/java/com/ning/billing/lifecycle/LifecycleHandlerType.java
+++ b/api/src/main/java/com/ning/billing/lifecycle/LifecycleHandlerType.java
@@ -16,14 +16,14 @@
 
 package com.ning.billing.lifecycle;
 
-import com.google.common.collect.Lists;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.util.List;
 
+import com.google.common.collect.Lists;
+
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface LifecycleHandlerType {
@@ -81,11 +81,11 @@ public @interface LifecycleHandlerType {
             STARTUP_POST_EVENT_REGISTRATION,
             SHUTDOWN_PRE_EVENT_UNREGISTRATION,
             SHUTDOWN_POST_EVENT_UNREGISTRATION
-        };
+        }
 
-        private Sequence seq;
+        private final Sequence seq;
 
-        LifecycleLevel(Sequence seq) {
+        LifecycleLevel(final Sequence seq) {
             this.seq = seq;
         }
 
@@ -96,9 +96,9 @@ public @interface LifecycleHandlerType {
         //
         // Returns an ordered list of level for a particular sequence
         //
-        public static List<LifecycleLevel> getLevelsForSequence(Sequence seq) {
-            List<LifecycleLevel> result = Lists.newLinkedList();
-            for (LifecycleLevel level : LifecycleLevel.values()) {
+        public static List<LifecycleLevel> getLevelsForSequence(final Sequence seq) {
+            final List<LifecycleLevel> result = Lists.newLinkedList();
+            for (final LifecycleLevel level : LifecycleLevel.values()) {
                 if (level.getSequence() == seq) {
                     result.add(level);
                 }

diff --git a/api/src/main/java/com/ning/billing/overdue/Condition.java b/api/src/main/java/com/ning/billing/overdue/Condition.java
index 8607e91..7ecc40b 100644
--- a/api/src/main/java/com/ning/billing/overdue/Condition.java
+++ b/api/src/main/java/com/ning/billing/overdue/Condition.java
@@ -22,9 +22,8 @@ import com.ning.billing.junction.api.Blockable;
 import com.ning.billing.overdue.config.api.BillingState;
 
 
-
 public interface Condition<T extends Blockable> {
 
     public boolean evaluate(BillingState<T> state, DateTime now);
 
-}
\ No newline at end of file
+}

diff --git a/api/src/main/java/com/ning/billing/overdue/config/api/BillingState.java b/api/src/main/java/com/ning/billing/overdue/config/api/BillingState.java
index dc4aaae..bec3db5 100644
--- a/api/src/main/java/com/ning/billing/overdue/config/api/BillingState.java
+++ b/api/src/main/java/com/ning/billing/overdue/config/api/BillingState.java
@@ -25,57 +25,57 @@ import com.ning.billing.junction.api.Blockable;
 import com.ning.billing.util.tag.Tag;
 
 public class BillingState<T extends Blockable> {
-	private final UUID objectId;
-	private final int numberOfUnpaidInvoices;
-	private final BigDecimal balanceOfUnpaidInvoices;
+    private final UUID objectId;
+    private final int numberOfUnpaidInvoices;
+    private final BigDecimal balanceOfUnpaidInvoices;
     private final DateTime dateOfEarliestUnpaidInvoice;
     private final UUID idOfEarliestUnpaidInvoice;
-	private final PaymentResponse responseForLastFailedPayment;
-	private final Tag[] tags;
-	
-	public BillingState(UUID id, 
-	        int numberOfUnpaidInvoices, 
-	        BigDecimal balanceOfUnpaidInvoices,
-			DateTime dateOfEarliestUnpaidInvoice,
-			UUID idOfEarliestUnpaidInvoice,
-			PaymentResponse responseForLastFailedPayment,
-			Tag[] tags) {
-		super();
-		this.objectId = id;
-		this.numberOfUnpaidInvoices = numberOfUnpaidInvoices;
-		this.balanceOfUnpaidInvoices = balanceOfUnpaidInvoices;
+    private final PaymentResponse responseForLastFailedPayment;
+    private final Tag[] tags;
+
+    public BillingState(final UUID id,
+                        final int numberOfUnpaidInvoices,
+                        final BigDecimal balanceOfUnpaidInvoices,
+                        final DateTime dateOfEarliestUnpaidInvoice,
+                        final UUID idOfEarliestUnpaidInvoice,
+                        final PaymentResponse responseForLastFailedPayment,
+                        final Tag[] tags) {
+        super();
+        this.objectId = id;
+        this.numberOfUnpaidInvoices = numberOfUnpaidInvoices;
+        this.balanceOfUnpaidInvoices = balanceOfUnpaidInvoices;
         this.dateOfEarliestUnpaidInvoice = dateOfEarliestUnpaidInvoice;
         this.idOfEarliestUnpaidInvoice = idOfEarliestUnpaidInvoice;
-		this.responseForLastFailedPayment = responseForLastFailedPayment;
-		this.tags = tags;
-	}
+        this.responseForLastFailedPayment = responseForLastFailedPayment;
+        this.tags = tags;
+    }
+
+    public UUID getObjectId() {
+        return objectId;
+    }
+
+    public int getNumberOfUnpaidInvoices() {
+        return numberOfUnpaidInvoices;
+    }
 
-	public UUID getObjectId() {
-		return objectId;
-	}
-	
-	public int getNumberOfUnpaidInvoices() {
-		return numberOfUnpaidInvoices;
-	}
+    public BigDecimal getBalanceOfUnpaidInvoices() {
+        return balanceOfUnpaidInvoices;
+    }
 
-	public BigDecimal getBalanceOfUnpaidInvoices() {
-		return balanceOfUnpaidInvoices;
-	}
+    public DateTime getDateOfEarliestUnpaidInvoice() {
+        return dateOfEarliestUnpaidInvoice;
+    }
 
-	public DateTime getDateOfEarliestUnpaidInvoice() {
-		return dateOfEarliestUnpaidInvoice;
-	}
-	
-	public UUID getIdOfEarliestUnpaidInvoice() {
+    public UUID getIdOfEarliestUnpaidInvoice() {
         return idOfEarliestUnpaidInvoice;
     }
 
     public PaymentResponse getResponseForLastFailedPayment() {
-		return responseForLastFailedPayment;
-	}
+        return responseForLastFailedPayment;
+    }
 
-	public Tag[] getTags() {
-		return tags;
-	}
+    public Tag[] getTags() {
+        return tags;
+    }
 
 }

diff --git a/api/src/main/java/com/ning/billing/overdue/config/api/BillingStateBundle.java b/api/src/main/java/com/ning/billing/overdue/config/api/BillingStateBundle.java
index 14aa4cd..600b1c2 100644
--- a/api/src/main/java/com/ning/billing/overdue/config/api/BillingStateBundle.java
+++ b/api/src/main/java/com/ning/billing/overdue/config/api/BillingStateBundle.java
@@ -33,38 +33,38 @@ public class BillingStateBundle extends BillingState<SubscriptionBundle> {
     private final BillingPeriod basePlanBillingPeriod;
     private final PriceList basePlanPriceList;
     private final PhaseType basePlanPhaseType;
-    
-	public BillingStateBundle(UUID id, 
-	        int numberOfUnpaidInvoices, 
-	        BigDecimal unpaidInvoiceBalance,
-			DateTime dateOfEarliestUnpaidInvoice,
-			UUID idOfEarliestUnpaidInvoice,
-			PaymentResponse responseForLastFailedPayment,
-			Tag[] tags, 
-			Product basePlanProduct,
-			BillingPeriod basePlanBillingPeriod, 
-			PriceList basePlanPriceList, PhaseType basePlanPhaseType) {
-		super(id, numberOfUnpaidInvoices, unpaidInvoiceBalance, 
-				dateOfEarliestUnpaidInvoice, idOfEarliestUnpaidInvoice, 
-				responseForLastFailedPayment, tags);
-		
-		this.basePlanProduct = basePlanProduct;
-		this.basePlanBillingPeriod = basePlanBillingPeriod;
-		this.basePlanPriceList = basePlanPriceList;
-		this.basePlanPhaseType = basePlanPhaseType;
-	}
-	
-	public Product getBasePlanProduct() {
-		return basePlanProduct;
-	}
-	
-	public BillingPeriod getBasePlanBillingPeriod() {
-		return basePlanBillingPeriod;
-	}
-	
-	public PriceList getBasePlanPriceList() {
-		return basePlanPriceList;
-	}
+
+    public BillingStateBundle(final UUID id,
+                              final int numberOfUnpaidInvoices,
+                              final BigDecimal unpaidInvoiceBalance,
+                              final DateTime dateOfEarliestUnpaidInvoice,
+                              final UUID idOfEarliestUnpaidInvoice,
+                              final PaymentResponse responseForLastFailedPayment,
+                              final Tag[] tags,
+                              final Product basePlanProduct,
+                              final BillingPeriod basePlanBillingPeriod,
+                              final PriceList basePlanPriceList, final PhaseType basePlanPhaseType) {
+        super(id, numberOfUnpaidInvoices, unpaidInvoiceBalance,
+              dateOfEarliestUnpaidInvoice, idOfEarliestUnpaidInvoice,
+              responseForLastFailedPayment, tags);
+
+        this.basePlanProduct = basePlanProduct;
+        this.basePlanBillingPeriod = basePlanBillingPeriod;
+        this.basePlanPriceList = basePlanPriceList;
+        this.basePlanPhaseType = basePlanPhaseType;
+    }
+
+    public Product getBasePlanProduct() {
+        return basePlanProduct;
+    }
+
+    public BillingPeriod getBasePlanBillingPeriod() {
+        return basePlanBillingPeriod;
+    }
+
+    public PriceList getBasePlanPriceList() {
+        return basePlanPriceList;
+    }
 
     public PhaseType getBasePlanPhaseType() {
         return basePlanPhaseType;

diff --git a/api/src/main/java/com/ning/billing/overdue/config/api/OverdueError.java b/api/src/main/java/com/ning/billing/overdue/config/api/OverdueError.java
index 78f62c6..b347632 100644
--- a/api/src/main/java/com/ning/billing/overdue/config/api/OverdueError.java
+++ b/api/src/main/java/com/ning/billing/overdue/config/api/OverdueError.java
@@ -21,21 +21,21 @@ import com.ning.billing.ErrorCode;
 
 public class OverdueError extends BillingExceptionBase {
 
-    public OverdueError(BillingExceptionBase cause) {
+    public OverdueError(final BillingExceptionBase cause) {
         super(cause);
-     }
+    }
 
-    public OverdueError(Throwable cause, int code, String msg) {
+    public OverdueError(final Throwable cause, final int code, final String msg) {
         super(cause, code, msg);
     }
 
     private static final long serialVersionUID = 1L;
 
-    public OverdueError(Throwable cause, ErrorCode code, Object... args) {
+    public OverdueError(final Throwable cause, final ErrorCode code, final Object... args) {
         super(cause, code, args);
     }
 
-    public OverdueError(ErrorCode code, Object... args) {
+    public OverdueError(final ErrorCode code, final Object... args) {
         super(code, args);
     }
 

diff --git a/api/src/main/java/com/ning/billing/overdue/config/api/PaymentResponse.java b/api/src/main/java/com/ning/billing/overdue/config/api/PaymentResponse.java
index fb82d7c..df1fa69 100644
--- a/api/src/main/java/com/ning/billing/overdue/config/api/PaymentResponse.java
+++ b/api/src/main/java/com/ning/billing/overdue/config/api/PaymentResponse.java
@@ -19,32 +19,32 @@ package com.ning.billing.overdue.config.api;
 public enum PaymentResponse {
     // Card issues
     INVALID_CARD("The card number, expiry date or cvc is invalid or incorrect"),
-	EXPIRED_CARD("The card has expired"),
-	LOST_OR_STOLEN_CARD("The card has been lost or stolen"),
+    EXPIRED_CARD("The card has expired"),
+    LOST_OR_STOLEN_CARD("The card has been lost or stolen"),
 
-	// Account issues
+    // Account issues
     DO_NOT_HONOR("Do not honor the card - usually a problem with account"),
-	INSUFFICIENT_FUNDS("The account had insufficient funds to fulfil the payment"),
-	DECLINE("Generic payment decline"),
-	
-	//Transaction
-	PROCESSING_ERROR("Error processing card"),
-	INVALID_AMOUNT("An invalid amount was entered"),
-	DUPLICATE_TRANSACTION("A transaction with identical amount and credit card information was submitted very recently."),
+    INSUFFICIENT_FUNDS("The account had insufficient funds to fulfil the payment"),
+    DECLINE("Generic payment decline"),
+
+    //Transaction
+    PROCESSING_ERROR("Error processing card"),
+    INVALID_AMOUNT("An invalid amount was entered"),
+    DUPLICATE_TRANSACTION("A transaction with identical amount and credit card information was submitted very recently."),
+
+    //Other
+    OTHER("Some other error");
+
+    private final String description;
+
+    private PaymentResponse(final String description) {
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
 
-	//Other
-	OTHER("Some other error");
-	
-	private String description;
-	
-	private PaymentResponse(String description) {
-	    this.description = description;
-	}
-	
-	public String getDescription() {
-	    return description;
-	}
-	
 //	 690118 | Approved
 //	 136956 | Do Not Honor
 //	 119640 | Insufficient Funds

diff --git a/api/src/main/java/com/ning/billing/overdue/OverdueApiException.java b/api/src/main/java/com/ning/billing/overdue/OverdueApiException.java
index 7629abf..df58f85 100644
--- a/api/src/main/java/com/ning/billing/overdue/OverdueApiException.java
+++ b/api/src/main/java/com/ning/billing/overdue/OverdueApiException.java
@@ -20,14 +20,14 @@ import com.ning.billing.BillingExceptionBase;
 import com.ning.billing.ErrorCode;
 
 public class OverdueApiException extends BillingExceptionBase {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	public OverdueApiException(Throwable cause, ErrorCode code, Object... args) {
-		super(cause, code, args);
-	}
+    public OverdueApiException(final Throwable cause, final ErrorCode code, final Object... args) {
+        super(cause, code, args);
+    }
 
-	public OverdueApiException(ErrorCode code, Object... args) {
-		super(code, args);
-	}
+    public OverdueApiException(final ErrorCode code, final Object... args) {
+        super(code, args);
+    }
 
 }

diff --git a/api/src/main/java/com/ning/billing/overdue/OverdueService.java b/api/src/main/java/com/ning/billing/overdue/OverdueService.java
index 06c1f15..8745653 100644
--- a/api/src/main/java/com/ning/billing/overdue/OverdueService.java
+++ b/api/src/main/java/com/ning/billing/overdue/OverdueService.java
@@ -24,5 +24,5 @@ public interface OverdueService extends KillbillService {
     public String getName();
 
     public OverdueUserApi getUserApi();
-    
+
 }

diff --git a/api/src/main/java/com/ning/billing/overdue/OverdueState.java b/api/src/main/java/com/ning/billing/overdue/OverdueState.java
index 231a434..39cf93d 100644
--- a/api/src/main/java/com/ning/billing/overdue/OverdueState.java
+++ b/api/src/main/java/com/ning/billing/overdue/OverdueState.java
@@ -21,22 +21,21 @@ import org.joda.time.Period;
 import com.ning.billing.junction.api.Blockable;
 
 
-
 public interface OverdueState<T extends Blockable> {
 
     public String getName();
 
     public String getExternalMessage();
-    
+
     public int getDaysBetweenPaymentRetries();
 
     public boolean disableEntitlementAndChangesBlocked();
 
     public boolean blockChanges();
-    
+
     public boolean isClearState();
 
     public Period getReevaluationInterval() throws OverdueApiException;
 
     public Condition<T> getCondition();
-}
\ No newline at end of file
+}

diff --git a/api/src/main/java/com/ning/billing/payment/api/Payment.java b/api/src/main/java/com/ning/billing/payment/api/Payment.java
index 33a7ab8..9171213 100644
--- a/api/src/main/java/com/ning/billing/payment/api/Payment.java
+++ b/api/src/main/java/com/ning/billing/payment/api/Payment.java
@@ -26,31 +26,31 @@ import com.ning.billing.catalog.api.Currency;
 public interface Payment {
 
     public UUID getId();
-    
+
     public UUID getAccountId();
-    
-    public UUID getInvoiceId();    
-    
+
+    public UUID getInvoiceId();
+
     public UUID getPaymentMethodId();
-    
+
     public Integer getPaymentNumber();
-    
+
     public BigDecimal getAmount();
-    
+
     public DateTime getEffectiveDate();
-    
+
     public Currency getCurrency();
-    
+
     public PaymentStatus getPaymentStatus();
-    
+
     public List<PaymentAttempt> getAttempts();
-    
+
     public interface PaymentAttempt {
-        
+
         public UUID getId();
-        
+
         public DateTime getEffectiveDate();
-        
+
         public String getErrorMsg();
 
         public PaymentStatus getPaymentStatus();

diff --git a/api/src/main/java/com/ning/billing/payment/api/PaymentApi.java b/api/src/main/java/com/ning/billing/payment/api/PaymentApi.java
index 63fc93a..c8f9b2f 100644
--- a/api/src/main/java/com/ning/billing/payment/api/PaymentApi.java
+++ b/api/src/main/java/com/ning/billing/payment/api/PaymentApi.java
@@ -21,60 +21,58 @@ import java.util.Set;
 import java.util.UUID;
 
 import com.ning.billing.account.api.Account;
-
-import com.ning.billing.payment.plugin.api.PaymentProviderAccount;
 import com.ning.billing.util.callcontext.CallContext;
 
 public interface PaymentApi {
-  
+
     public Payment createPayment(final String accountKey, final UUID invoiceId, final BigDecimal amount, final CallContext context)
-    throws PaymentApiException;
+            throws PaymentApiException;
 
     public Payment createPayment(final Account account, final UUID invoiceId, final BigDecimal amount, final CallContext context)
-    throws PaymentApiException;
+            throws PaymentApiException;
 
     public Refund createRefund(final Account account, final UUID paymentId, final CallContext context)
-    throws PaymentApiException;
+            throws PaymentApiException;
 
     public List<Payment> getInvoicePayments(final UUID invoiceId)
-    throws PaymentApiException;
-
-   public List<Payment> getAccountPayments(final UUID accountId)
-    throws PaymentApiException;
-   
-   public Payment getPayment(final UUID paymentId)
-   throws PaymentApiException;
-   
-   /*
+            throws PaymentApiException;
+
+    public List<Payment> getAccountPayments(final UUID accountId)
+            throws PaymentApiException;
+
+    public Payment getPayment(final UUID paymentId)
+            throws PaymentApiException;
+
+    /*
     * Payment method Apis
     */
-   public Set<String> getAvailablePlugins();
-   
-   public String initializeAccountPlugin(final String pluginName, final Account account)
-   throws PaymentApiException;
-   
-   public UUID addPaymentMethod(final String pluginName, final Account account, boolean setDefault, final PaymentMethodPlugin paymentMethodInfo, final CallContext context)
-   throws PaymentApiException;
-   
-   public List<PaymentMethod> refreshPaymentMethods(final String pluginName, final Account account, final CallContext context)
-    throws PaymentApiException;
-   
-   public List<PaymentMethod> getPaymentMethods(final Account account, final boolean withPluginDetail)
-    throws PaymentApiException;
-
-   public PaymentMethod getPaymentMethodById(final UUID paymentMethodId)
-   throws PaymentApiException;
-
-   public PaymentMethod getPaymentMethod(final Account account, final UUID paymentMethodId, final boolean withPluginDetail)
-   throws PaymentApiException;
-   
-   public void updatePaymentMethod(final Account account, final UUID paymentMethodId, final PaymentMethodPlugin paymentMetghodInfo)
-   throws PaymentApiException;
-   
-   public void deletedPaymentMethod(final Account account, final UUID paymentMethodId, final CallContext context)
-   throws PaymentApiException;
-   
-   public void setDefaultPaymentMethod(final Account account, final UUID paymentMethodId, final CallContext context)
-   throws PaymentApiException;
+    public Set<String> getAvailablePlugins();
+
+    public String initializeAccountPlugin(final String pluginName, final Account account)
+            throws PaymentApiException;
+
+    public UUID addPaymentMethod(final String pluginName, final Account account, boolean setDefault, final PaymentMethodPlugin paymentMethodInfo, final CallContext context)
+            throws PaymentApiException;
+
+    public List<PaymentMethod> refreshPaymentMethods(final String pluginName, final Account account, final CallContext context)
+            throws PaymentApiException;
+
+    public List<PaymentMethod> getPaymentMethods(final Account account, final boolean withPluginDetail)
+            throws PaymentApiException;
+
+    public PaymentMethod getPaymentMethodById(final UUID paymentMethodId)
+            throws PaymentApiException;
+
+    public PaymentMethod getPaymentMethod(final Account account, final UUID paymentMethodId, final boolean withPluginDetail)
+            throws PaymentApiException;
+
+    public void updatePaymentMethod(final Account account, final UUID paymentMethodId, final PaymentMethodPlugin paymentMetghodInfo)
+            throws PaymentApiException;
+
+    public void deletedPaymentMethod(final Account account, final UUID paymentMethodId, final CallContext context)
+            throws PaymentApiException;
+
+    public void setDefaultPaymentMethod(final Account account, final UUID paymentMethodId, final CallContext context)
+            throws PaymentApiException;
 
 }

diff --git a/api/src/main/java/com/ning/billing/payment/api/PaymentApiException.java b/api/src/main/java/com/ning/billing/payment/api/PaymentApiException.java
index fd3445d..2ef846d 100644
--- a/api/src/main/java/com/ning/billing/payment/api/PaymentApiException.java
+++ b/api/src/main/java/com/ning/billing/payment/api/PaymentApiException.java
@@ -23,19 +23,19 @@ public class PaymentApiException extends BillingExceptionBase {
 
     private static final long serialVersionUID = 39445033L;
 
-    public PaymentApiException(AccountApiException e) {
+    public PaymentApiException(final AccountApiException e) {
         super(e, e.getCode(), e.getMessage());
     }
 
-    public PaymentApiException(Throwable e, ErrorCode code, Object...args) {
+    public PaymentApiException(final Throwable e, final ErrorCode code, final Object... args) {
         super(e, code, args);
     }
 
-    public PaymentApiException(Throwable e, int code, String message) {
+    public PaymentApiException(final Throwable e, final int code, final String message) {
         super(e, code, message);
     }
 
-    public PaymentApiException(ErrorCode code, Object...args) {
+    public PaymentApiException(final ErrorCode code, final Object... args) {
         super(code, args);
     }
 }

diff --git a/api/src/main/java/com/ning/billing/payment/api/PaymentErrorEvent.java b/api/src/main/java/com/ning/billing/payment/api/PaymentErrorEvent.java
index 3217bdb..3dadf88 100644
--- a/api/src/main/java/com/ning/billing/payment/api/PaymentErrorEvent.java
+++ b/api/src/main/java/com/ning/billing/payment/api/PaymentErrorEvent.java
@@ -26,6 +26,6 @@ public interface PaymentErrorEvent extends BusEvent {
     public UUID getInvoiceId();
 
     public UUID getAccountId();
-    
+
     public UUID getPaymentId();
 }

diff --git a/api/src/main/java/com/ning/billing/payment/api/PaymentInfoEvent.java b/api/src/main/java/com/ning/billing/payment/api/PaymentInfoEvent.java
index 040034b..8c5a1ef 100644
--- a/api/src/main/java/com/ning/billing/payment/api/PaymentInfoEvent.java
+++ b/api/src/main/java/com/ning/billing/payment/api/PaymentInfoEvent.java
@@ -17,16 +17,18 @@ package com.ning.billing.payment.api;
 
 import java.math.BigDecimal;
 import java.util.UUID;
-import com.ning.billing.util.entity.Entity;
+
 import org.joda.time.DateTime;
+
 import com.ning.billing.util.bus.BusEvent;
+import com.ning.billing.util.entity.Entity;
 
 public interface PaymentInfoEvent extends Entity, BusEvent {
 
     public UUID getPaymentId();
-    
+
     public UUID getAccountId();
-    
+
     public UUID getInvoiceId();
 
     public BigDecimal getAmount();

diff --git a/api/src/main/java/com/ning/billing/payment/api/PaymentMethod.java b/api/src/main/java/com/ning/billing/payment/api/PaymentMethod.java
index 94299e7..dfe9668 100644
--- a/api/src/main/java/com/ning/billing/payment/api/PaymentMethod.java
+++ b/api/src/main/java/com/ning/billing/payment/api/PaymentMethod.java
@@ -19,14 +19,14 @@ import java.util.UUID;
 
 
 public interface PaymentMethod {
-    
+
     public UUID getId();
-    
+
     public UUID getAccountId();
-    
+
     public Boolean isActive();
-    
+
     public String getPluginName();
-    
+
     public PaymentMethodPlugin getPluginDetail();
 }

diff --git a/api/src/main/java/com/ning/billing/payment/api/PaymentMethodPlugin.java b/api/src/main/java/com/ning/billing/payment/api/PaymentMethodPlugin.java
index f829232..cacdf3a 100644
--- a/api/src/main/java/com/ning/billing/payment/api/PaymentMethodPlugin.java
+++ b/api/src/main/java/com/ning/billing/payment/api/PaymentMethodPlugin.java
@@ -18,21 +18,21 @@ package com.ning.billing.payment.api;
 import java.util.List;
 
 public interface PaymentMethodPlugin {
-    
+
     public String getExternalPaymentMethodId();
-    
+
     public boolean isDefaultPaymentMethod();
-    
-    public List<PaymentMethodKVInfo> getProperties(); 
-    
+
+    public List<PaymentMethodKVInfo> getProperties();
+
     public String getValueString(String key);
-    
+
     public class PaymentMethodKVInfo {
         private final String key;
         private final Object value;
         private final Boolean isUpdatable;
-        
-        public PaymentMethodKVInfo(String key, Object value, Boolean isUpdatable) {
+
+        public PaymentMethodKVInfo(final String key, final Object value, final Boolean isUpdatable) {
             super();
             this.key = key;
             this.value = value;

diff --git a/api/src/main/java/com/ning/billing/payment/api/PaymentStatus.java b/api/src/main/java/com/ning/billing/payment/api/PaymentStatus.java
index ad77bdc..151447c 100644
--- a/api/src/main/java/com/ning/billing/payment/api/PaymentStatus.java
+++ b/api/src/main/java/com/ning/billing/payment/api/PaymentStatus.java
@@ -23,16 +23,16 @@ public enum PaymentStatus {
     UNKNOWN,
     /* Status for Payment when AUTO_PAY_OFF is turned on */
     AUTO_PAY_OFF,
-    /* Status for Payment and PaymentAttempt when the plugin failed to make the Payment and we will schedule a FailedPaymentRetry */    
+    /* Status for Payment and PaymentAttempt when the plugin failed to make the Payment and we will schedule a FailedPaymentRetry */
     PAYMENT_FAILURE,
     /* Payment failure , we already retried a maximum of time */
     PAYMENT_FAILURE_ABORTED,
     /* Exception from plugin, state is unknown and needs to be retried */
     PLUGIN_FAILURE,
     /* Exception from plugin, we already retried a maximum of time */
-    PLUGIN_FAILURE_ABORTED,    
-    /* PaymentAttenmpt timedout; When TimedoutPaymentRetry kicks in, it check moves the state to TIMEDOUT if this is still in UNKNWON state */    
+    PLUGIN_FAILURE_ABORTED,
+    /* PaymentAttenmpt timedout; When TimedoutPaymentRetry kicks in, it check moves the state to TIMEDOUT if this is still in UNKNWON state */
     TIMEDOUT,
     /* Status for Payment and PaymentAttempt all TimedoutPaymentRetry failed */
-    TIMEDOUT_ABORTED,    
+    TIMEDOUT_ABORTED,
 }

diff --git a/api/src/main/java/com/ning/billing/payment/plugin/api/NoOpPaymentPluginApi.java b/api/src/main/java/com/ning/billing/payment/plugin/api/NoOpPaymentPluginApi.java
index 2b3620a..21ef934 100644
--- a/api/src/main/java/com/ning/billing/payment/plugin/api/NoOpPaymentPluginApi.java
+++ b/api/src/main/java/com/ning/billing/payment/plugin/api/NoOpPaymentPluginApi.java
@@ -18,9 +18,9 @@ package com.ning.billing.payment.plugin.api;
 public interface NoOpPaymentPluginApi extends PaymentPluginApi {
 
     public void clear();
-    
+
     public void makeNextPaymentFailWithError();
-    
+
     public void makeNextPaymentFailWithException();
 
     public void makeAllInvoicesFailWithError(boolean failure);

diff --git a/api/src/main/java/com/ning/billing/payment/plugin/api/PaymentInfoPlugin.java b/api/src/main/java/com/ning/billing/payment/plugin/api/PaymentInfoPlugin.java
index 18e4d5e..3e8b563 100644
--- a/api/src/main/java/com/ning/billing/payment/plugin/api/PaymentInfoPlugin.java
+++ b/api/src/main/java/com/ning/billing/payment/plugin/api/PaymentInfoPlugin.java
@@ -20,13 +20,13 @@ import java.math.BigDecimal;
 import org.joda.time.DateTime;
 
 public interface PaymentInfoPlugin {
-    
+
     public enum PaymentPluginStatus {
         UNDEFINED,
         PROCESSED,
         ERROR
-    };
-    
+    }
+
     public BigDecimal getAmount();
 
     public DateTime getCreatedDate();
@@ -34,8 +34,8 @@ public interface PaymentInfoPlugin {
     public DateTime getEffectiveDate();
 
     public PaymentPluginStatus getStatus();
-    
+
     public String getGatewayError();
-    
+
     public String getGatewayErrorCode();
 }

diff --git a/api/src/main/java/com/ning/billing/payment/plugin/api/PaymentPluginApi.java b/api/src/main/java/com/ning/billing/payment/plugin/api/PaymentPluginApi.java
index aa965a6..10b329e 100644
--- a/api/src/main/java/com/ning/billing/payment/plugin/api/PaymentPluginApi.java
+++ b/api/src/main/java/com/ning/billing/payment/plugin/api/PaymentPluginApi.java
@@ -24,36 +24,36 @@ import com.ning.billing.account.api.Account;
 import com.ning.billing.payment.api.PaymentMethodPlugin;
 
 public interface PaymentPluginApi {
-    
+
     public String getName();
-    
+
     public PaymentInfoPlugin processPayment(String externalAccountKey, UUID paymentId, BigDecimal amount)
-    throws PaymentPluginApiException;
+            throws PaymentPluginApiException;
 
     public PaymentInfoPlugin getPaymentInfo(UUID paymentId)
-    throws PaymentPluginApiException;
+            throws PaymentPluginApiException;
 
     public List<PaymentInfoPlugin> processRefund(Account account)
-    throws PaymentPluginApiException;
-    
+            throws PaymentPluginApiException;
+
     public String createPaymentProviderAccount(Account account)
-    throws PaymentPluginApiException;
+            throws PaymentPluginApiException;
 
-    public List<PaymentMethodPlugin> getPaymentMethodDetails(String accountKey) 
-    throws PaymentPluginApiException;
+    public List<PaymentMethodPlugin> getPaymentMethodDetails(String accountKey)
+            throws PaymentPluginApiException;
 
-    public PaymentMethodPlugin getPaymentMethodDetail(String accountKey, String externalPaymentMethodId) 
-    throws PaymentPluginApiException;
+    public PaymentMethodPlugin getPaymentMethodDetail(String accountKey, String externalPaymentMethodId)
+            throws PaymentPluginApiException;
 
     public String addPaymentMethod(String accountKey, PaymentMethodPlugin paymentMethodProps, boolean setDefault)
-    throws PaymentPluginApiException;
+            throws PaymentPluginApiException;
 
     public void updatePaymentMethod(String accountKey, PaymentMethodPlugin paymentMethodProps)
-    throws PaymentPluginApiException;
+            throws PaymentPluginApiException;
 
     public void deletePaymentMethod(String accountKey, String externalPaymentMethodId)
-    throws PaymentPluginApiException;    
+            throws PaymentPluginApiException;
 
     public void setDefaultPaymentMethod(String accountKey, String externalPaymentId)
-    throws PaymentPluginApiException;    
+            throws PaymentPluginApiException;
 }

diff --git a/api/src/main/java/com/ning/billing/payment/plugin/api/PaymentPluginApiException.java b/api/src/main/java/com/ning/billing/payment/plugin/api/PaymentPluginApiException.java
index 5df657e..d201a27 100644
--- a/api/src/main/java/com/ning/billing/payment/plugin/api/PaymentPluginApiException.java
+++ b/api/src/main/java/com/ning/billing/payment/plugin/api/PaymentPluginApiException.java
@@ -18,10 +18,10 @@ package com.ning.billing.payment.plugin.api;
 public class PaymentPluginApiException extends Exception {
 
     private static final long serialVersionUID = 15642965L;
-    
+
     private final String errorType;
     private final String errorMessage;
-    
+
     public PaymentPluginApiException(final String errorType, final String errorMessage) {
         this.errorMessage = errorMessage;
         this.errorType = errorType;

diff --git a/api/src/main/java/com/ning/billing/payment/plugin/api/PaymentProviderAccount.java b/api/src/main/java/com/ning/billing/payment/plugin/api/PaymentProviderAccount.java
index 0244dbf..cfeb7df 100644
--- a/api/src/main/java/com/ning/billing/payment/plugin/api/PaymentProviderAccount.java
+++ b/api/src/main/java/com/ning/billing/payment/plugin/api/PaymentProviderAccount.java
@@ -25,11 +25,11 @@ public class PaymentProviderAccount {
     private final String phoneNumber;
     private final String defaultPaymentMethodId;
 
-    public PaymentProviderAccount(String id,
-                                  String accountKey,
-                                  String accountName,
-                                  String phoneNumber,
-                                  String defaultPaymentMethodId) {
+    public PaymentProviderAccount(final String id,
+                                  final String accountKey,
+                                  final String accountName,
+                                  final String phoneNumber,
+                                  final String defaultPaymentMethodId) {
         this.id = id;
         this.accountKey = accountKey;
         this.accountName = accountName;
@@ -64,7 +64,7 @@ public class PaymentProviderAccount {
         private String phoneNumber;
         private String defaultPaymentMethodId;
 
-        public Builder copyFrom(PaymentProviderAccount src) {
+        public Builder copyFrom(final PaymentProviderAccount src) {
             this.id = src.getId();
             this.accountKey = src.getAccountKey();
             this.accountName = src.getAccountName();
@@ -73,27 +73,27 @@ public class PaymentProviderAccount {
             return this;
         }
 
-        public Builder setId(String id) {
+        public Builder setId(final String id) {
             this.id = id;
             return this;
         }
 
-        public Builder setAccountKey(String accountKey) {
+        public Builder setAccountKey(final String accountKey) {
             this.accountKey = accountKey;
             return this;
         }
 
-        public Builder setAccountName(String accountName) {
+        public Builder setAccountName(final String accountName) {
             this.accountName = accountName;
             return this;
         }
 
-        public Builder setPhoneNumber(String phoneNumber) {
+        public Builder setPhoneNumber(final String phoneNumber) {
             this.phoneNumber = phoneNumber;
             return this;
         }
 
-        public Builder setDefaultPaymentMethod(String defaultPaymentMethod) {
+        public Builder setDefaultPaymentMethod(final String defaultPaymentMethod) {
             this.defaultPaymentMethodId = defaultPaymentMethod;
             return this;
         }
@@ -114,18 +114,17 @@ public class PaymentProviderAccount {
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (getClass() == obj.getClass()) {
-            PaymentProviderAccount other = (PaymentProviderAccount)obj;
+            final PaymentProviderAccount other = (PaymentProviderAccount) obj;
             if (obj == other) {
                 return true;
-            }
-            else {
+            } else {
                 return Objects.equal(id, other.id) &&
-                       Objects.equal(accountKey, other.accountKey) &&
-                       Objects.equal(accountName, other.accountName) &&
-                       Objects.equal(phoneNumber, other.phoneNumber) &&
-                       Objects.equal(defaultPaymentMethodId, other.defaultPaymentMethodId);
+                        Objects.equal(accountKey, other.accountKey) &&
+                        Objects.equal(accountName, other.accountName) &&
+                        Objects.equal(phoneNumber, other.phoneNumber) &&
+                        Objects.equal(defaultPaymentMethodId, other.defaultPaymentMethodId);
             }
         }
         return false;

diff --git a/api/src/main/java/com/ning/billing/payment/provider/PaymentProviderPluginRegistry.java b/api/src/main/java/com/ning/billing/payment/provider/PaymentProviderPluginRegistry.java
index 321a421..d05f762 100644
--- a/api/src/main/java/com/ning/billing/payment/provider/PaymentProviderPluginRegistry.java
+++ b/api/src/main/java/com/ning/billing/payment/provider/PaymentProviderPluginRegistry.java
@@ -24,6 +24,6 @@ public interface PaymentProviderPluginRegistry {
     public void register(final PaymentPluginApi plugin, final String name);
 
     public PaymentPluginApi getPlugin(final String name);
-    
+
     public Set<String> getRegisteredPluginNames();
 }

diff --git a/api/src/main/java/com/ning/billing/util/api/CustomFieldUserApi.java b/api/src/main/java/com/ning/billing/util/api/CustomFieldUserApi.java
index 649c034..828d030 100644
--- a/api/src/main/java/com/ning/billing/util/api/CustomFieldUserApi.java
+++ b/api/src/main/java/com/ning/billing/util/api/CustomFieldUserApi.java
@@ -16,14 +16,14 @@
 
 package com.ning.billing.util.api;
 
-import com.ning.billing.util.callcontext.CallContext;
-import com.ning.billing.util.customfield.CustomField;
-import com.ning.billing.util.dao.ObjectType;
-
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
+import com.ning.billing.util.callcontext.CallContext;
+import com.ning.billing.util.customfield.CustomField;
+import com.ning.billing.util.dao.ObjectType;
+
 public interface CustomFieldUserApi {
     Map<String, CustomField> getCustomFields(UUID objectId, ObjectType objectType);
 

diff --git a/api/src/main/java/com/ning/billing/util/bus/Bus.java b/api/src/main/java/com/ning/billing/util/bus/Bus.java
index 3410e83..0368f27 100644
--- a/api/src/main/java/com/ning/billing/util/bus/Bus.java
+++ b/api/src/main/java/com/ning/billing/util/bus/Bus.java
@@ -16,19 +16,18 @@
 
 package com.ning.billing.util.bus;
 
-import com.google.common.eventbus.Subscribe;
 import org.skife.jdbi.v2.sqlobject.mixins.Transmogrifier;
 
+import com.google.common.eventbus.Subscribe;
+
 
 /**
- *
  * Bus API based on the guava EventBus API
- *
+ * <p/>
  * The API also provides an API to send events from within a transaction
  * with the guarantee that the event will be delivered if and only if
  * the transaction completes. If the implementation is not based on a
  * DB, this API is behaves the same as the regular post() call.
- *
  */
 public interface Bus {
 
@@ -40,35 +39,32 @@ public interface Bus {
         public EventBusException() {
             super();
         }
-        public EventBusException(String message, Throwable cause) {
+
+        public EventBusException(final String message, final Throwable cause) {
             super(message, cause);
         }
 
-        public EventBusException(String message) {
+        public EventBusException(final String message) {
             super(message);
         }
     }
 
     /**
      * Start accepting events and dispatching them
-     *
      */
     public void start();
 
     /**
      * Stop accepting events and flush event queue before it returns.
-     *
      */
     public void stop();
 
     /**
-     *
      * Registers all handler methods on {@code object} to receive events.
      * Handler methods need to be Annotated with {@link Subscribe}
      *
      * @param handlerInstance
-     *
-     *  @throws EventBusException if bus not been started yet
+     * @throws EventBusException if bus not been started yet
      */
     public void register(Object handlerInstance) throws EventBusException;
 
@@ -86,21 +82,17 @@ public interface Bus {
      * Post an event asynchronously
      *
      * @param event to be posted
-     *
-     *  @throws EventBusException if bus not been started yet
+     * @throws EventBusException if bus not been started yet
      */
     public void post(BusEvent event) throws EventBusException;
 
     /**
-     *
      * Post an event from within a transaction.
      * Guarantees that the event is persisted on disk from within the same transaction
      *
-     *
      * @param event to be posted
-     * @param dao a valid DAO object obtained through the DBI.onDemand() API.
-     *
-     *  @throws EventBusException if bus not been started yet
+     * @param dao   a valid DAO object obtained through the DBI.onDemand() API.
+     * @throws EventBusException if bus not been started yet
      */
     public void postFromTransaction(BusEvent event, Transmogrifier dao) throws EventBusException;
 

diff --git a/api/src/main/java/com/ning/billing/util/callcontext/CallContext.java b/api/src/main/java/com/ning/billing/util/callcontext/CallContext.java
index fd364bf..2887f51 100644
--- a/api/src/main/java/com/ning/billing/util/callcontext/CallContext.java
+++ b/api/src/main/java/com/ning/billing/util/callcontext/CallContext.java
@@ -21,12 +21,19 @@ import java.util.UUID;
 import org.joda.time.DateTime;
 
 public interface CallContext {
-	public UUID getUserToken();
+    public UUID getUserToken();
+
     public String getUserName();
+
     public CallOrigin getCallOrigin();
+
     public UserType getUserType();
+
     public String getReasonCode();
+
     public String getComment();
+
     public DateTime getCreatedDate();
+
     public DateTime getUpdatedDate();
 }

diff --git a/api/src/main/java/com/ning/billing/util/dao/ObjectType.java b/api/src/main/java/com/ning/billing/util/dao/ObjectType.java
index b961b39..a158e77 100644
--- a/api/src/main/java/com/ning/billing/util/dao/ObjectType.java
+++ b/api/src/main/java/com/ning/billing/util/dao/ObjectType.java
@@ -27,7 +27,8 @@ public enum ObjectType {
     PAYMENT_METHOD("payment method");
 
     private final String objectName;
-    ObjectType(String objectName) {
+
+    ObjectType(final String objectName) {
         this.objectName = objectName;
     }
 

diff --git a/api/src/main/java/com/ning/billing/util/email/EmailApiException.java b/api/src/main/java/com/ning/billing/util/email/EmailApiException.java
index 9b5d6ba..6842e74 100644
--- a/api/src/main/java/com/ning/billing/util/email/EmailApiException.java
+++ b/api/src/main/java/com/ning/billing/util/email/EmailApiException.java
@@ -22,15 +22,15 @@ import com.ning.billing.ErrorCode;
 public class EmailApiException extends BillingExceptionBase {
     private static final long serialVersionUID = 1L;
 
-    public EmailApiException(Throwable cause, int code, final String msg) {
+    public EmailApiException(final Throwable cause, final int code, final String msg) {
         super(cause, code, msg);
     }
 
-    public EmailApiException(Throwable cause, ErrorCode code, final Object... args) {
+    public EmailApiException(final Throwable cause, final ErrorCode code, final Object... args) {
         super(cause, code, args);
     }
 
-    public EmailApiException(ErrorCode code, final Object... args) {
+    public EmailApiException(final ErrorCode code, final Object... args) {
         super(code, args);
     }
 }

diff --git a/api/src/main/java/com/ning/billing/util/entity/EntityPersistenceException.java b/api/src/main/java/com/ning/billing/util/entity/EntityPersistenceException.java
index 0b593ca..33dd3a8 100644
--- a/api/src/main/java/com/ning/billing/util/entity/EntityPersistenceException.java
+++ b/api/src/main/java/com/ning/billing/util/entity/EntityPersistenceException.java
@@ -22,15 +22,15 @@ import com.ning.billing.ErrorCode;
 public class EntityPersistenceException extends BillingExceptionBase {
     private static final long serialVersionUID = 1L;
 
-    public EntityPersistenceException(Throwable cause, int code, final String msg) {
+    public EntityPersistenceException(final Throwable cause, final int code, final String msg) {
         super(cause, code, msg);
     }
 
-    public EntityPersistenceException(Throwable cause, ErrorCode code, final Object... args) {
+    public EntityPersistenceException(final Throwable cause, final ErrorCode code, final Object... args) {
         super(cause, code, args);
     }
 
-    public EntityPersistenceException(ErrorCode code, final Object... args) {
+    public EntityPersistenceException(final ErrorCode code, final Object... args) {
         super(code, args);
     }
 }

diff --git a/api/src/main/java/com/ning/billing/util/queue/QueueLifecycle.java b/api/src/main/java/com/ning/billing/util/queue/QueueLifecycle.java
index 8db4ec7..b839468 100644
--- a/api/src/main/java/com/ning/billing/util/queue/QueueLifecycle.java
+++ b/api/src/main/java/com/ning/billing/util/queue/QueueLifecycle.java
@@ -23,12 +23,11 @@ public interface QueueLifecycle {
 
     /**
      * Stop the queue
-     *
      */
     public void stopQueue();
-    
+
     /**
-     *  Processes event from queue
+     * Processes event from queue
      */
     public int doProcessEvents();
 }

diff --git a/api/src/main/java/com/ning/billing/util/tag/ControlTagType.java b/api/src/main/java/com/ning/billing/util/tag/ControlTagType.java
index 65d32c7..f7bf292 100644
--- a/api/src/main/java/com/ning/billing/util/tag/ControlTagType.java
+++ b/api/src/main/java/com/ning/billing/util/tag/ControlTagType.java
@@ -20,7 +20,7 @@ import java.util.UUID;
 
 public enum ControlTagType {
     AUTO_PAY_OFF("Suspends payments until removed.", true, false),
-    AUTO_INVOICING_OFF("Suspends invoicing until removed.", false, true), 
+    AUTO_INVOICING_OFF("Suspends invoicing until removed.", false, true),
     OVERDUE_ENFORCEMENT_OFF("Suspends overdue enforcement behaviour until removed.", false, false),
     WRITTEN_OFF("Indicated that an invoice is written off. No billing or payment effect.", false, false);
 
@@ -48,15 +48,25 @@ public enum ControlTagType {
 
     public TagDefinition toTagDefinition() {
         return new TagDefinition() {
-            @Override public String getName() {
+            @Override
+            public String getName() {
                 return name();
             }
 
-            @Override public String getDescription() {return description;}
+            @Override
+            public String getDescription() {
+                return description;
+            }
 
-            @Override public Boolean isControlTag() {return true;}
+            @Override
+            public Boolean isControlTag() {
+                return true;
+            }
 
-            @Override public UUID getId() {return null;}
+            @Override
+            public UUID getId() {
+                return null;
+            }
         };
     }
 }

diff --git a/api/src/main/java/com/ning/billing/util/userrequest/CompletionUserRequest.java b/api/src/main/java/com/ning/billing/util/userrequest/CompletionUserRequest.java
index bf67736..f240a02 100644
--- a/api/src/main/java/com/ning/billing/util/userrequest/CompletionUserRequest.java
+++ b/api/src/main/java/com/ning/billing/util/userrequest/CompletionUserRequest.java
@@ -15,5 +15,5 @@
  */
 package com.ning.billing.util.userrequest;
 
-public interface CompletionUserRequest extends CompletionUserRequestNotifier, CompletionUserRequestWaiter{
+public interface CompletionUserRequest extends CompletionUserRequestNotifier, CompletionUserRequestWaiter {
 }

diff --git a/api/src/main/java/com/ning/billing/util/userrequest/CompletionUserRequestNotifier.java b/api/src/main/java/com/ning/billing/util/userrequest/CompletionUserRequestNotifier.java
index 62b9256..befa2d7 100644
--- a/api/src/main/java/com/ning/billing/util/userrequest/CompletionUserRequestNotifier.java
+++ b/api/src/main/java/com/ning/billing/util/userrequest/CompletionUserRequestNotifier.java
@@ -20,6 +20,6 @@ import com.ning.billing.util.bus.BusEvent;
 public interface CompletionUserRequestNotifier {
 
     public void notifyForCompletion();
-    
+
     public void onBusEvent(BusEvent curEvent);
 }

diff --git a/api/src/main/java/com/ning/billing/util/userrequest/CompletionUserRequestWaiter.java b/api/src/main/java/com/ning/billing/util/userrequest/CompletionUserRequestWaiter.java
index d1258c8..f491beb 100644
--- a/api/src/main/java/com/ning/billing/util/userrequest/CompletionUserRequestWaiter.java
+++ b/api/src/main/java/com/ning/billing/util/userrequest/CompletionUserRequestWaiter.java
@@ -16,7 +16,6 @@
 package com.ning.billing.util.userrequest;
 
 import java.util.List;
-import java.util.UUID;
 import java.util.concurrent.TimeoutException;
 
 import com.ning.billing.account.api.AccountChangeEvent;
@@ -31,18 +30,18 @@ import com.ning.billing.util.bus.BusEvent;
 public interface CompletionUserRequestWaiter {
 
     public List<BusEvent> waitForCompletion(final long timeoutMilliSec) throws InterruptedException, TimeoutException;
-    
+
     public void onAccountCreation(final AccountCreationEvent curEvent);
 
     public void onAccountChange(final AccountChangeEvent curEvent);
 
-    public void onSubscriptionTransition(final SubscriptionEvent curEvent);    
+    public void onSubscriptionTransition(final SubscriptionEvent curEvent);
+
+    public void onInvoiceCreation(final InvoiceCreationEvent curEvent);
 
-    public void onInvoiceCreation(final InvoiceCreationEvent curEvent);    
-    
-    public void onEmptyInvoice(final EmptyInvoiceEvent curEvent);        
+    public void onEmptyInvoice(final EmptyInvoiceEvent curEvent);
 
-    public void onPaymentInfo(final PaymentInfoEvent curEvent);    
+    public void onPaymentInfo(final PaymentInfoEvent curEvent);
 
-    public void onPaymentError(final PaymentErrorEvent curEvent);    
+    public void onPaymentError(final PaymentErrorEvent curEvent);
 }

diff --git a/beatrix/pom.xml b/beatrix/pom.xml
index 4d035b1..0226f17 100644
--- a/beatrix/pom.xml
+++ b/beatrix/pom.xml
@@ -8,7 +8,8 @@
     OR CONDITIONS OF ANY KIND, either express or implied. See the ~ License for 
     the specific language governing permissions and limitations ~ under the License. -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.ning.billing</groupId>
@@ -72,15 +73,15 @@
             <artifactId>slf4j-simple</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency> 
+        <dependency>
             <groupId>com.jayway.awaitility</groupId>
             <artifactId>awaitility</artifactId>
             <scope>test</scope>
-        </dependency>      
-         <dependency>
+        </dependency>
+        <dependency>
             <groupId>com.ning.billing</groupId>
             <artifactId>killbill-junction</artifactId>
-             <type>test-jar</type>
+            <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/beatrix/src/main/java/com/ning/billing/beatrix/lifecycle/DefaultLifecycle.java b/beatrix/src/main/java/com/ning/billing/beatrix/lifecycle/DefaultLifecycle.java
index 8a07355..c5cfd73 100644
--- a/beatrix/src/main/java/com/ning/billing/beatrix/lifecycle/DefaultLifecycle.java
+++ b/beatrix/src/main/java/com/ning/billing/beatrix/lifecycle/DefaultLifecycle.java
@@ -16,6 +16,18 @@
 
 package com.ning.billing.beatrix.lifecycle;
 
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArraySet;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.google.common.base.Supplier;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
@@ -27,22 +39,11 @@ import com.ning.billing.lifecycle.KillbillService;
 import com.ning.billing.lifecycle.LifecycleHandlerType;
 import com.ning.billing.lifecycle.LifecycleHandlerType.LifecycleLevel;
 import com.ning.billing.lifecycle.LifecycleHandlerType.LifecycleLevel.Sequence;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArraySet;
 
 
 public class DefaultLifecycle implements Lifecycle {
 
-    private final static Logger log = LoggerFactory.getLogger(DefaultLifecycle.class);
+    private static final Logger log = LoggerFactory.getLogger(DefaultLifecycle.class);
     private final SetMultimap<LifecycleLevel, LifecycleHandler<? extends KillbillService>> handlersByLevel;
 
     private final ServiceFinder serviceFinder;
@@ -50,17 +51,17 @@ public class DefaultLifecycle implements Lifecycle {
     protected final Injector injector;
 
     @Inject
-    public DefaultLifecycle(Injector injector) {
+    public DefaultLifecycle(final Injector injector) {
 
         this.serviceFinder = new ServiceFinder(DefaultLifecycle.class.getClassLoader());
         this.handlersByLevel = Multimaps.newSetMultimap(new ConcurrentHashMap<LifecycleLevel, Collection<LifecycleHandler<? extends KillbillService>>>(),
 
-                new Supplier<Set<LifecycleHandler<? extends KillbillService>>>() {
-            @Override
-            public Set<LifecycleHandler<? extends KillbillService>> get() {
-                return new CopyOnWriteArraySet<LifecycleHandler<? extends KillbillService>>();
-            }
-        });
+                                                        new Supplier<Set<LifecycleHandler<? extends KillbillService>>>() {
+                                                            @Override
+                                                            public Set<LifecycleHandler<? extends KillbillService>> get() {
+                                                                return new CopyOnWriteArraySet<LifecycleHandler<? extends KillbillService>>();
+                                                            }
+                                                        });
         this.injector = injector;
 
         init();
@@ -89,12 +90,12 @@ public class DefaultLifecycle implements Lifecycle {
 
     protected Set<? extends KillbillService> findServices() {
 
-        Set<KillbillService> result = new HashSet<KillbillService>();
-        Set<Class<? extends KillbillService>> services =  serviceFinder.getServices();
-        for (Class<? extends KillbillService> cur : services) {
+        final Set<KillbillService> result = new HashSet<KillbillService>();
+        final Set<Class<? extends KillbillService>> services = serviceFinder.getServices();
+        for (final Class<? extends KillbillService> cur : services) {
             log.debug("Found service {}", cur.getName());
             try {
-                KillbillService instance = injector.getInstance(cur);
+                final KillbillService instance = injector.getInstance(cur);
                 log.debug("got instance {}", instance.getName());
                 result.add(instance);
             } catch (Exception e) {
@@ -106,28 +107,28 @@ public class DefaultLifecycle implements Lifecycle {
     }
 
     private void init() {
-        Set<? extends KillbillService> services = findServices();
-        Iterator<? extends KillbillService> it = services.iterator();
+        final Set<? extends KillbillService> services = findServices();
+        final Iterator<? extends KillbillService> it = services.iterator();
         while (it.hasNext()) {
             handlersByLevel.putAll(findAllHandlers(it.next()));
         }
     }
 
-    private void fireSequence(Sequence seq) {
-        List<LifecycleLevel> levels = LifecycleLevel.getLevelsForSequence(seq);
-        for (LifecycleLevel cur : levels) {
+    private void fireSequence(final Sequence seq) {
+        final List<LifecycleLevel> levels = LifecycleLevel.getLevelsForSequence(seq);
+        for (final LifecycleLevel cur : levels) {
             doFireStage(cur);
         }
     }
 
-    private void doFireStage(LifecycleLevel level) {
+    private void doFireStage(final LifecycleLevel level) {
         log.info("Killbill lifecycle firing stage {}", level);
-        Set<LifecycleHandler<? extends KillbillService>> handlers = handlersByLevel.get(level);
-        for (LifecycleHandler<? extends KillbillService> cur : handlers) {
+        final Set<LifecycleHandler<? extends KillbillService>> handlers = handlersByLevel.get(level);
+        for (final LifecycleHandler<? extends KillbillService> cur : handlers) {
 
             try {
-                Method method = cur.getMethod();
-                KillbillService target = cur.getTarget();
+                final Method method = cur.getMethod();
+                final KillbillService target = cur.getTarget();
                 log.info("Killbill lifecycle calling handler {} for service {}", cur.getMethod().getName(), target.getName());
                 method.invoke(target);
             } catch (Exception e) {
@@ -139,18 +140,18 @@ public class DefaultLifecycle implements Lifecycle {
 
 
     // Used to disable valid injection failure from unit tests
-    protected void logWarn(String msg, Exception e) {
+    protected void logWarn(final String msg, final Exception e) {
         log.warn(msg, e);
     }
 
-    private Multimap<LifecycleLevel, LifecycleHandler<? extends KillbillService>> findAllHandlers(KillbillService service) {
-        Multimap<LifecycleLevel, LifecycleHandler<? extends KillbillService>> methodsInService = HashMultimap.create();
-        Class<? extends KillbillService> clazz = service.getClass();
-        for (Method method : clazz.getMethods()) {
-            LifecycleHandlerType annotation = method.getAnnotation(LifecycleHandlerType.class);
+    private Multimap<LifecycleLevel, LifecycleHandler<? extends KillbillService>> findAllHandlers(final KillbillService service) {
+        final Multimap<LifecycleLevel, LifecycleHandler<? extends KillbillService>> methodsInService = HashMultimap.create();
+        final Class<? extends KillbillService> clazz = service.getClass();
+        for (final Method method : clazz.getMethods()) {
+            final LifecycleHandlerType annotation = method.getAnnotation(LifecycleHandlerType.class);
             if (annotation != null) {
-                LifecycleLevel level = annotation.value();
-                LifecycleHandler<? extends KillbillService> handler = new  LifecycleHandler<KillbillService>(service, method);
+                final LifecycleLevel level = annotation.value();
+                final LifecycleHandler<? extends KillbillService> handler = new LifecycleHandler<KillbillService>(service, method);
                 methodsInService.put(level, handler);
             }
         }
@@ -161,7 +162,7 @@ public class DefaultLifecycle implements Lifecycle {
         private final T target;
         private final Method method;
 
-        public LifecycleHandler(T target, Method method) {
+        public LifecycleHandler(final T target, final Method method) {
             this.target = target;
             this.method = method;
         }

diff --git a/beatrix/src/main/java/com/ning/billing/beatrix/lifecycle/ServiceFinder.java b/beatrix/src/main/java/com/ning/billing/beatrix/lifecycle/ServiceFinder.java
index e27dff9..52c7716 100644
--- a/beatrix/src/main/java/com/ning/billing/beatrix/lifecycle/ServiceFinder.java
+++ b/beatrix/src/main/java/com/ning/billing/beatrix/lifecycle/ServiceFinder.java
@@ -16,10 +16,6 @@
 
 package com.ning.billing.beatrix.lifecycle;
 
-import com.ning.billing.lifecycle.KillbillService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -33,178 +29,183 @@ import java.util.List;
 import java.util.Set;
 import java.util.jar.JarFile;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.ning.billing.lifecycle.KillbillService;
+
 public class ServiceFinder {
 
     private static final Logger log = LoggerFactory.getLogger(ServiceFinder.class);
 
-	private final ClassLoader loader;
-	private final Set<Class<? extends KillbillService>> servicesTypes;
-
-	public ServiceFinder(ClassLoader loader) {
-		this.loader = loader;
-		this.servicesTypes = initialize();
-		Iterator<Class<? extends KillbillService>> it = servicesTypes.iterator();
-		while (it.hasNext()) {
-		    Class<? extends KillbillService> svc = it.next();
-			log.debug("Found IService classes {}", svc.getName());
-		}
-	}
-
-	public Set<Class<? extends KillbillService>> getServices() {
-	    return servicesTypes;
-	}
-
-	private Set<Class<? extends KillbillService>> initialize() {
-		try {
-
-		    final Set<String> packageFilter = new HashSet<String>();
-		    packageFilter.add("com.ning.billing");
-		    final String jarFilter = "killbill";
-			return findClasses(loader, KillbillService.class.getName(), jarFilter, packageFilter);
-		} catch (ClassNotFoundException nfe) {
-			throw new RuntimeException("Failed to initialize ClassFinder", nfe);
-		}
-	}
+    private final ClassLoader loader;
+    private final Set<Class<? extends KillbillService>> servicesTypes;
+
+    public ServiceFinder(final ClassLoader loader) {
+        this.loader = loader;
+        this.servicesTypes = initialize();
+        final Iterator<Class<? extends KillbillService>> it = servicesTypes.iterator();
+        while (it.hasNext()) {
+            final Class<? extends KillbillService> svc = it.next();
+            log.debug("Found IService classes {}", svc.getName());
+        }
+    }
+
+    public Set<Class<? extends KillbillService>> getServices() {
+        return servicesTypes;
+    }
+
+    private Set<Class<? extends KillbillService>> initialize() {
+        try {
+
+            final Set<String> packageFilter = new HashSet<String>();
+            packageFilter.add("com.ning.billing");
+            final String jarFilter = "killbill";
+            return findClasses(loader, KillbillService.class.getName(), jarFilter, packageFilter);
+        } catch (ClassNotFoundException nfe) {
+            throw new RuntimeException("Failed to initialize ClassFinder", nfe);
+        }
+    }
 
     /*
      *  Code originally from Kris Dover <krisdover@hotmail.com> and adapted for my purpose.
      *
      */
-	private static Set<Class<? extends KillbillService>> findClasses(ClassLoader classLoader,
-	        String interfaceFilter,
-	        String jarFilter,
-	        Set<String> packageFilter)
-	        throws ClassNotFoundException {
-
-	    final Set<Class<? extends KillbillService>> result = new HashSet<Class<? extends KillbillService>>();
-
-	    Object[] classPaths;
-	    try {
-	        classPaths = ((java.net.URLClassLoader) classLoader).getURLs();
-	    } catch(ClassCastException cce){
-	        classPaths = System.getProperty("java.class.path", "").split(File.pathSeparator);
-	    }
-
-	    for (int h = 0; h < classPaths.length; h++) {
-	        Enumeration<?> files = null;
-	        JarFile module = null;
-	        File classPath = new File( (URL.class).isInstance(classPaths[h]) ?
-	                ((URL)classPaths[h]).getFile() : classPaths[h].toString());
-	        if (classPath.isDirectory()) {
+    private static Set<Class<? extends KillbillService>> findClasses(final ClassLoader classLoader,
+                                                                     final String interfaceFilter,
+                                                                     final String jarFilter,
+                                                                     final Set<String> packageFilter)
+            throws ClassNotFoundException {
+
+        final Set<Class<? extends KillbillService>> result = new HashSet<Class<? extends KillbillService>>();
+
+        Object[] classPaths;
+        try {
+            classPaths = ((java.net.URLClassLoader) classLoader).getURLs();
+        } catch (ClassCastException cce) {
+            classPaths = System.getProperty("java.class.path", "").split(File.pathSeparator);
+        }
+
+        for (int h = 0; h < classPaths.length; h++) {
+            Enumeration<?> files = null;
+            JarFile module = null;
+            final File classPath = new File((URL.class).isInstance(classPaths[h]) ?
+                                              ((URL) classPaths[h]).getFile() : classPaths[h].toString());
+            if (classPath.isDirectory()) {
 
                 log.debug("DIR : " + classPath);
 
-	            List<String> dirListing = new ArrayList<String>();
-	            recursivelyListDir(dirListing, classPath, new StringBuffer() );
-	            files = Collections.enumeration(dirListing);
-	        } else if (classPath.getName().endsWith(".jar")) {
-
-	            log.debug("JAR : " + classPath);
-
-	            String [] jarParts = classPath.getName().split("/");
-	            String jarName = jarParts[jarParts.length - 1];
-	            if (jarFilter != null && jarName != null && ! jarName.startsWith(jarFilter)) {
-	                continue;
-	            }
-	            boolean failed = true;
-	            try {
-	                module = new JarFile(classPath);
-	                failed = false;
-	            } catch (MalformedURLException mue){
-	                throw new ClassNotFoundException("Bad classpath. Error: " + mue.getMessage());
-	            } catch (IOException io){
-	                throw new ClassNotFoundException("jar file '" + classPath.getName() +
-	                        "' could not be instantiate from file path. Error: " + io.getMessage());
-	            }
-	            if (! failed) {
-	                files = module.entries();
-	            }
-	        }
-
-	        while( files != null && files.hasMoreElements() ){
-	            String fileName = files.nextElement().toString();
-
-	            if( fileName.endsWith(".class") ){
-	                String className = fileName.replaceAll("/", ".").substring(0, fileName.length() - 6);
-	                if (packageFilter != null) {
-	                    boolean skip = true;
-	                    Iterator<String> it = packageFilter.iterator();
-	                    while (it.hasNext()) {
-	                        String filter = it.next() + ".";
-	                        if (className.startsWith(filter)) {
-	                            skip = false;
-	                            break;
-	                        }
-	                    }
-	                    if (skip) {
-	                        continue;
-	                    }
-	                }
-	                Class<?> theClass = null;
-	                try {
-	                    theClass = Class.forName(className, false, classLoader);
-	                } catch(NoClassDefFoundError e) {
-	                    continue;
-	                }
-	                if ( theClass.isInterface() ) {
-	                    continue;
-	                }
-	                Class<?> [] classInterfaces = getAllInterfaces(theClass);
-	                String interfaceName = null;
-	                for (int i = 0; i < classInterfaces.length; i++) {
-
-	                    interfaceName = classInterfaces[i].getName();
-	                    if (!interfaceFilter.equals(interfaceName) ) {
-	                        continue;
-	                    }
-	                    result.add((Class<? extends KillbillService>) theClass);
-	                    break;
-	                }
-
-	            }
-	        }
-	        if (module != null) {
-	            try {
-	                module.close();
-	            } catch(IOException ioe) {
-	                throw new ClassNotFoundException("The module jar file '" + classPath.getName() +
-	                        "' could not be closed. Error: " + ioe.getMessage());
-	            }
-	        }
-	    }
-	    return result;
-	}
-
-	private static Class<?> [] getAllInterfaces(Class<?> theClass) {
-	    Set<Class<?>> superInterfaces = new HashSet<Class<?>>();
-	    Class<?> [] classInterfaces = theClass.getInterfaces();
-	    for (Class<?> cur : classInterfaces) {
-	        getSuperInterfaces(superInterfaces, cur);
-	    }
-	    return superInterfaces.toArray(new Class<?>[superInterfaces.size()]);
-	}
-
-	private static void getSuperInterfaces(Set<Class<?>> superInterfaces, Class<?> theInterface) {
-
-	    superInterfaces.add(theInterface);
-	    Class<?> [] classInterfaces = theInterface.getInterfaces();
-	    for (Class<?> cur : classInterfaces) {
-	        getSuperInterfaces(superInterfaces, cur);
-	    }
-	}
-
-	private static void recursivelyListDir(List<String> dirListing, File dir, StringBuffer relativePath){
-	    int prevLen;
-	    if (dir.isDirectory()) {
-	        File[] files = dir.listFiles();
-	        for(int i = 0; i < files.length; i++){
-	            prevLen = relativePath.length();
-	            recursivelyListDir(dirListing, files[i],
-	                    relativePath.append(prevLen == 0 ? "" : "/" ).append( files[i].getName()));
-	            relativePath.delete(prevLen, relativePath.length());
-	        }
-	    } else {
-	        dirListing.add(relativePath.toString());
-	    }
-	}
+                final List<String> dirListing = new ArrayList<String>();
+                recursivelyListDir(dirListing, classPath, new StringBuffer());
+                files = Collections.enumeration(dirListing);
+            } else if (classPath.getName().endsWith(".jar")) {
+
+                log.debug("JAR : " + classPath);
+
+                final String[] jarParts = classPath.getName().split("/");
+                final String jarName = jarParts[jarParts.length - 1];
+                if (jarFilter != null && jarName != null && !jarName.startsWith(jarFilter)) {
+                    continue;
+                }
+                boolean failed = true;
+                try {
+                    module = new JarFile(classPath);
+                    failed = false;
+                } catch (MalformedURLException mue) {
+                    throw new ClassNotFoundException("Bad classpath. Error: " + mue.getMessage());
+                } catch (IOException io) {
+                    throw new ClassNotFoundException("jar file '" + classPath.getName() +
+                                                             "' could not be instantiate from file path. Error: " + io.getMessage());
+                }
+                if (!failed) {
+                    files = module.entries();
+                }
+            }
+
+            while (files != null && files.hasMoreElements()) {
+                final String fileName = files.nextElement().toString();
+
+                if (fileName.endsWith(".class")) {
+                    final String className = fileName.replaceAll("/", ".").substring(0, fileName.length() - 6);
+                    if (packageFilter != null) {
+                        boolean skip = true;
+                        final Iterator<String> it = packageFilter.iterator();
+                        while (it.hasNext()) {
+                            final String filter = it.next() + ".";
+                            if (className.startsWith(filter)) {
+                                skip = false;
+                                break;
+                            }
+                        }
+                        if (skip) {
+                            continue;
+                        }
+                    }
+                    Class<?> theClass = null;
+                    try {
+                        theClass = Class.forName(className, false, classLoader);
+                    } catch (NoClassDefFoundError e) {
+                        continue;
+                    }
+                    if (theClass.isInterface()) {
+                        continue;
+                    }
+                    final Class<?>[] classInterfaces = getAllInterfaces(theClass);
+                    String interfaceName = null;
+                    for (int i = 0; i < classInterfaces.length; i++) {
+
+                        interfaceName = classInterfaces[i].getName();
+                        if (!interfaceFilter.equals(interfaceName)) {
+                            continue;
+                        }
+                        result.add((Class<? extends KillbillService>) theClass);
+                        break;
+                    }
+
+                }
+            }
+            if (module != null) {
+                try {
+                    module.close();
+                } catch (IOException ioe) {
+                    throw new ClassNotFoundException("The module jar file '" + classPath.getName() +
+                                                             "' could not be closed. Error: " + ioe.getMessage());
+                }
+            }
+        }
+        return result;
+    }
+
+    private static Class<?>[] getAllInterfaces(final Class<?> theClass) {
+        final Set<Class<?>> superInterfaces = new HashSet<Class<?>>();
+        final Class<?>[] classInterfaces = theClass.getInterfaces();
+        for (final Class<?> cur : classInterfaces) {
+            getSuperInterfaces(superInterfaces, cur);
+        }
+        return superInterfaces.toArray(new Class<?>[superInterfaces.size()]);
+    }
+
+    private static void getSuperInterfaces(final Set<Class<?>> superInterfaces, final Class<?> theInterface) {
+
+        superInterfaces.add(theInterface);
+        final Class<?>[] classInterfaces = theInterface.getInterfaces();
+        for (final Class<?> cur : classInterfaces) {
+            getSuperInterfaces(superInterfaces, cur);
+        }
+    }
+
+    private static void recursivelyListDir(final List<String> dirListing, final File dir, final StringBuffer relativePath) {
+        int prevLen;
+        if (dir.isDirectory()) {
+            final File[] files = dir.listFiles();
+            for (int i = 0; i < files.length; i++) {
+                prevLen = relativePath.length();
+                recursivelyListDir(dirListing, files[i],
+                                   relativePath.append(prevLen == 0 ? "" : "/").append(files[i].getName()));
+                relativePath.delete(prevLen, relativePath.length());
+            }
+        } else {
+            dirListing.add(relativePath.toString());
+        }
+    }
 }

diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/BeatrixModule.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/BeatrixModule.java
index 58a9c63..0e0ea55 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/BeatrixModule.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/BeatrixModule.java
@@ -16,8 +16,6 @@
 
 package com.ning.billing.beatrix.integration;
 
-import static org.testng.Assert.assertNotNull;
-
 import java.io.IOException;
 import java.net.URL;
 import java.util.Set;
@@ -31,7 +29,6 @@ import com.google.inject.Inject;
 import com.google.inject.Injector;
 import com.ning.billing.account.api.AccountService;
 import com.ning.billing.account.glue.AccountModule;
-import com.ning.billing.account.glue.AccountModuleWithMocks;
 import com.ning.billing.beatrix.integration.overdue.IntegrationTestOverdueModule;
 import com.ning.billing.beatrix.lifecycle.DefaultLifecycle;
 import com.ning.billing.beatrix.lifecycle.Lifecycle;
@@ -63,9 +60,11 @@ import com.ning.billing.util.glue.GlobalLockerModule;
 import com.ning.billing.util.glue.NotificationQueueModule;
 import com.ning.billing.util.glue.TagStoreModule;
 
+import static org.testng.Assert.assertNotNull;
+
 
 public class BeatrixModule extends AbstractModule {
-    
+
     public static final String PLUGIN_NAME = "yoyo";
 
     @Override
@@ -82,7 +81,7 @@ public class BeatrixModule extends AbstractModule {
         final IDBI dbi;
         if (helper.isUsingLocalInstance()) {
             final DbiConfig config = new ConfigurationObjectFactory(System.getProperties()).build(DbiConfig.class);
-            DBIProvider provider = new DBIProvider(config);
+            final DBIProvider provider = new DBIProvider(config);
             dbi = provider.get();
         } else {
             dbi = helper.getDBI();
@@ -108,7 +107,7 @@ public class BeatrixModule extends AbstractModule {
 
     private static final class PaymentPluginMockModule extends PaymentModule {
         @Override
-        protected void installPaymentProviderPlugins(PaymentConfig config) {
+        protected void installPaymentProviderPlugins(final PaymentConfig config) {
             install(new MockPaymentProviderPluginModule(PLUGIN_NAME));
         }
     }
@@ -117,30 +116,30 @@ public class BeatrixModule extends AbstractModule {
         final URL url = TestIntegration.class.getResource(resource);
         assertNotNull(url);
         try {
-            System.getProperties().load( url.openStream() );
+            System.getProperties().load(url.openStream());
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
     }
 
-    private final static class SubsetDefaultLifecycle extends DefaultLifecycle {
+    private static final class SubsetDefaultLifecycle extends DefaultLifecycle {
 
         @Inject
-        public SubsetDefaultLifecycle(Injector injector) {
+        public SubsetDefaultLifecycle(final Injector injector) {
             super(injector);
         }
 
         @Override
         protected Set<? extends KillbillService> findServices() {
-            ImmutableSet<? extends KillbillService> services = new ImmutableSet.Builder<KillbillService>()
-                            .add(injector.getInstance(AccountService.class))
-                            .add(injector.getInstance(BusService.class))
-                            .add(injector.getInstance(CatalogService.class))
-                            .add(injector.getInstance(EntitlementService.class))
-                            .add(injector.getInstance(InvoiceService.class))
-                            .add(injector.getInstance(PaymentService.class))
-                            .add(injector.getInstance(OverdueService.class))
-                            .build();
+            final ImmutableSet<? extends KillbillService> services = new ImmutableSet.Builder<KillbillService>()
+                    .add(injector.getInstance(AccountService.class))
+                    .add(injector.getInstance(BusService.class))
+                    .add(injector.getInstance(CatalogService.class))
+                    .add(injector.getInstance(EntitlementService.class))
+                    .add(injector.getInstance(InvoiceService.class))
+                    .add(injector.getInstance(PaymentService.class))
+                    .add(injector.getInstance(OverdueService.class))
+                    .build();
             return services;
         }
     }

diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/IntegrationTestOverdueModule.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/IntegrationTestOverdueModule.java
index 2e120dc..45c948a 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/IntegrationTestOverdueModule.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/IntegrationTestOverdueModule.java
@@ -20,11 +20,11 @@ import com.ning.billing.overdue.OverdueService;
 import com.ning.billing.overdue.glue.DefaultOverdueModule;
 
 public class IntegrationTestOverdueModule extends DefaultOverdueModule {
-   
-    
+
+
     protected void installOverdueService() {
-        bind(OverdueService.class).to(MockOverdueService.class);    
+        bind(OverdueService.class).to(MockOverdueService.class);
     }
 
-     
+
 }

diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/MockOverdueService.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/MockOverdueService.java
index cdb323b..7dc1ddb 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/MockOverdueService.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/MockOverdueService.java
@@ -27,13 +27,13 @@ import com.ning.billing.util.bus.BusService;
 
 public class MockOverdueService extends DefaultOverdueService {
     @Inject
-    public MockOverdueService(OverdueUserApi userApi, OverdueProperties properties, OverdueCheckNotifier notifier,
-            BusService busService, OverdueListener listener, OverdueWrapperFactory factory) {
+    public MockOverdueService(final OverdueUserApi userApi, final OverdueProperties properties, final OverdueCheckNotifier notifier,
+                              final BusService busService, final OverdueListener listener, final OverdueWrapperFactory factory) {
         super(userApi, properties, notifier, busService, listener, factory);
     }
 
     public synchronized void loadConfig() throws ServiceException {
-       
+
     }
- 
-}
\ No newline at end of file
+
+}

diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/TestOverdueIntegration.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/TestOverdueIntegration.java
index 8b205f8..c6b1d85 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/TestOverdueIntegration.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/TestOverdueIntegration.java
@@ -16,11 +16,6 @@
 
 package com.ning.billing.beatrix.integration.overdue;
 
-import static com.jayway.awaitility.Awaitility.await;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.math.BigDecimal;
@@ -62,73 +57,35 @@ import com.ning.billing.util.callcontext.DefaultCallContext;
 import com.ning.billing.util.clock.ClockMock;
 import com.ning.billing.util.config.XMLLoader;
 
+import static com.jayway.awaitility.Awaitility.await;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
 @Test(groups = "slow")
 @Guice(modules = {BeatrixModule.class})
 public class TestOverdueIntegration extends TestIntegrationBase {
-    private final String configXml =  
-            "<overdueConfig>" +
-                    "   <bundleOverdueStates>" +
-                    "       <state name=\"OD3\">" +
-                    "           <condition>" +
-                    "               <timeSinceEarliestUnpaidInvoiceEqualsOrExceeds>" +
-                    "                   <unit>DAYS</unit><number>50</number>" +
-                    "               </timeSinceEarliestUnpaidInvoiceEqualsOrExceeds>" +
-                    "           </condition>" +
-                    "           <externalMessage>Reached OD3</externalMessage>" +
-                    "           <blockChanges>true</blockChanges>" +
-                    "           <disableEntitlementAndChangesBlocked>true</disableEntitlementAndChangesBlocked>" +
-                    "           <autoReevaluationInterval>" +
-                    "               <unit>DAYS</unit><number>5</number>" +
-                    "           </autoReevaluationInterval>" +
-                    "       </state>" +
-                    "       <state name=\"OD2\">" +
-                    "           <condition>" +
-                    "               <timeSinceEarliestUnpaidInvoiceEqualsOrExceeds>" +
-                    "                   <unit>DAYS</unit><number>40</number>" +
-                    "               </timeSinceEarliestUnpaidInvoiceEqualsOrExceeds>" +
-                    "           </condition>" +
-                    "           <externalMessage>Reached OD2</externalMessage>" +
-                    "           <blockChanges>true</blockChanges>" +
-                    "           <disableEntitlementAndChangesBlocked>true</disableEntitlementAndChangesBlocked>" +
-                    "           <autoReevaluationInterval>" +
-                    "               <unit>DAYS</unit><number>5</number>" +
-                    "           </autoReevaluationInterval>" +
-                    "       </state>" +
-                    "       <state name=\"OD1\">" +
-                    "           <condition>" +
-                    "               <timeSinceEarliestUnpaidInvoiceEqualsOrExceeds>" +
-                    "                   <unit>DAYS</unit><number>30</number>" +
-                    "               </timeSinceEarliestUnpaidInvoiceEqualsOrExceeds>" +
-                    "           </condition>" +
-                    "           <externalMessage>Reached OD1</externalMessage>" +
-                    "           <blockChanges>true</blockChanges>" +
-                    "           <disableEntitlementAndChangesBlocked>false</disableEntitlementAndChangesBlocked>" +
-                    "           <autoReevaluationInterval>" +
-                    "               <unit>DAYS</unit><number>100</number>" + // this number is intentionally too high
-                    "           </autoReevaluationInterval>" +
-                    "       </state>" +
-                    "   </bundleOverdueStates>" +
-                    "</overdueConfig>";
-    private OverdueConfig config; 
 
     @Inject
     private ClockMock clock;
 
+    @Named("yoyo")
     @Inject
-    private @Named("yoyo") MockPaymentProviderPlugin paymentPlugin;
+    private
+    MockPaymentProviderPlugin paymentPlugin;
 
     @Inject
     private BlockingApi blockingApi;
-    
+
     @Inject
     private OverdueWrapperFactory overdueWrapperFactory;
-    
+
     @Inject
     private OverdueUserApi overdueApi;
-    
+
     @Inject
     private PaymentApi paymentApi;
-    
+
     @Inject
     private InvoiceUserApi invoiceApi;
 
@@ -140,26 +97,72 @@ public class TestOverdueIntegration extends TestIntegrationBase {
 
     @BeforeMethod(groups = {"slow"})
     public void setupOverdue() throws Exception {
-        InputStream is = new ByteArrayInputStream(configXml.getBytes());
-        config = XMLLoader.getObjectFromStreamNoValidation(is,  OverdueConfig.class);
+        final String configXml = "<overdueConfig>" +
+                "   <bundleOverdueStates>" +
+                "       <state name=\"OD3\">" +
+                "           <condition>" +
+                "               <timeSinceEarliestUnpaidInvoiceEqualsOrExceeds>" +
+                "                   <unit>DAYS</unit><number>50</number>" +
+                "               </timeSinceEarliestUnpaidInvoiceEqualsOrExceeds>" +
+                "           </condition>" +
+                "           <externalMessage>Reached OD3</externalMessage>" +
+                "           <blockChanges>true</blockChanges>" +
+                "           <disableEntitlementAndChangesBlocked>true</disableEntitlementAndChangesBlocked>" +
+                "           <autoReevaluationInterval>" +
+                "               <unit>DAYS</unit><number>5</number>" +
+                "           </autoReevaluationInterval>" +
+                "       </state>" +
+                "       <state name=\"OD2\">" +
+                "           <condition>" +
+                "               <timeSinceEarliestUnpaidInvoiceEqualsOrExceeds>" +
+                "                   <unit>DAYS</unit><number>40</number>" +
+                "               </timeSinceEarliestUnpaidInvoiceEqualsOrExceeds>" +
+                "           </condition>" +
+                "           <externalMessage>Reached OD2</externalMessage>" +
+                "           <blockChanges>true</blockChanges>" +
+                "           <disableEntitlementAndChangesBlocked>true</disableEntitlementAndChangesBlocked>" +
+                "           <autoReevaluationInterval>" +
+                "               <unit>DAYS</unit><number>5</number>" +
+                "           </autoReevaluationInterval>" +
+                "       </state>" +
+                "       <state name=\"OD1\">" +
+                "           <condition>" +
+                "               <timeSinceEarliestUnpaidInvoiceEqualsOrExceeds>" +
+                "                   <unit>DAYS</unit><number>30</number>" +
+                "               </timeSinceEarliestUnpaidInvoiceEqualsOrExceeds>" +
+                "           </condition>" +
+                "           <externalMessage>Reached OD1</externalMessage>" +
+                "           <blockChanges>true</blockChanges>" +
+                "           <disableEntitlementAndChangesBlocked>false</disableEntitlementAndChangesBlocked>" +
+                "           <autoReevaluationInterval>" +
+                "               <unit>DAYS</unit><number>100</number>" + // this number is intentionally too high
+                "           </autoReevaluationInterval>" +
+                "       </state>" +
+                "   </bundleOverdueStates>" +
+                "</overdueConfig>";
+        final InputStream is = new ByteArrayInputStream(configXml.getBytes());
+        final OverdueConfig config = XMLLoader.getObjectFromStreamNoValidation(is, OverdueConfig.class);
         overdueWrapperFactory.setOverdueConfig(config);
-        
+
         account = createAccountWithPaymentMethod(getAccountData(25));
         assertNotNull(account);
-        
-        PaymentMethodPlugin info = new PaymentMethodPlugin() {
+
+        final PaymentMethodPlugin info = new PaymentMethodPlugin() {
             @Override
             public boolean isDefaultPaymentMethod() {
                 return false;
             }
+
             @Override
-            public String getValueString(String key) {
+            public String getValueString(final String key) {
                 return null;
             }
+
             @Override
             public List<PaymentMethodKVInfo> getProperties() {
                 return null;
             }
+
             @Override
             public String getExternalPaymentMethodId() {
                 return UUID.randomUUID().toString();
@@ -180,30 +183,30 @@ public class TestOverdueIntegration extends TestIntegrationBase {
     }
 
     @AfterMethod
-    public void cleanup(){
+    public void cleanup() {
         // Clear databases
     }
 
-    @Test(groups={"slow"}, enabled = true)
+    @Test(groups = {"slow"}, enabled = true)
     public void testBasicOverdueState() throws Exception {
         clock.setTime(new DateTime(2012, 5, 1, 0, 3, 42, 0));
         paymentPlugin.makeAllInvoicesFailWithError(true);
-        
+
         // set next invoice to fail and create subscription 
         busHandler.pushExpectedEvents(NextEvent.CREATE, NextEvent.INVOICE);
-        SubscriptionData baseSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
-                new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, context));
+        final SubscriptionData baseSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+                                                                                                                   new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, context));
         assertNotNull(baseSubscription);
         assertTrue(busHandler.isCompleted(DELAY));
 
         busHandler.pushExpectedEvents(NextEvent.PHASE, NextEvent.INVOICE, NextEvent.PAYMENT_ERROR);
         clock.addDays(30); // DAY 30 have to get out of trial before first payment
-        
+
         assertTrue(busHandler.isCompleted(DELAY));
-        
+
         // should still be in clear state
         checkODState(BlockingApi.CLEAR_STATE_NAME);
-    
+
         clock.addDays(15); // DAY 45 - 15 days after invoice
         assertTrue(busHandler.isCompleted(DELAY));
         //should still be in clear state
@@ -212,10 +215,10 @@ public class TestOverdueIntegration extends TestIntegrationBase {
         busHandler.pushExpectedEvents(NextEvent.INVOICE, NextEvent.PAYMENT_ERROR);
         clock.addDays(20); // DAY 65 - 35 days after invoice
         assertTrue(busHandler.isCompleted(DELAY));
-        
+
         //Now we should be in OD1
         checkODState("OD1");
-          
+
         clock.addDays(2); //DAY 67 - 37 days after invoice
         assertTrue(busHandler.isCompleted(DELAY));
         // should still be in OD1
@@ -226,41 +229,41 @@ public class TestOverdueIntegration extends TestIntegrationBase {
         assertTrue(busHandler.isCompleted(DELAY));
         // should still be in OD1
         checkODState("OD2");
-        
+
         busHandler.pushExpectedEvents(NextEvent.INVOICE, NextEvent.PAYMENT_ERROR);
         clock.addDays(10); //DAY 85 - 55 days after invoice
         assertTrue(busHandler.isCompleted(DELAY));
         // should now be in OD2 state once the update is processed
         checkODState("OD3");
-        
+
         paymentPlugin.makeAllInvoicesFailWithError(false);
-        Collection<Invoice> invoices = invoiceApi.getUnpaidInvoicesByAccountId(account.getId(), clock.getUTCNow());
-        List<String> invoiceIds = new ArrayList<String>();
-        for (Invoice invoice : invoices) {
-            invoiceIds.add(invoice.getId().toString()); 
+        final Collection<Invoice> invoices = invoiceApi.getUnpaidInvoicesByAccountId(account.getId(), clock.getUTCNow());
+        final List<String> invoiceIds = new ArrayList<String>();
+        for (final Invoice invoice : invoices) {
+            invoiceIds.add(invoice.getId().toString());
             if (invoice.getBalance().compareTo(BigDecimal.ZERO) > 0) {
                 busHandler.pushExpectedEvent(NextEvent.PAYMENT);
                 paymentApi.createPayment(account, invoice.getId(), invoice.getBalance(), new DefaultCallContext("test", null, null, clock));
                 assertTrue(busHandler.isCompleted(DELAY));
             }
         }
-        
+
         checkODState(BlockingApi.CLEAR_STATE_NAME);
 
     }
 
     private void checkODState(final String expected) {
-        
+
         try {
             await().atMost(10, SECONDS).until(new Callable<Boolean>() {
                 @Override
                 public Boolean call() throws Exception {
-                    overdueApi.refreshOverdueStateFor(bundle); 
-                    return expected.equals(blockingApi.getBlockingStateFor(bundle).getStateName()) ;
+                    overdueApi.refreshOverdueStateFor(bundle);
+                    return expected.equals(blockingApi.getBlockingStateFor(bundle).getStateName());
                 }
             });
         } catch (Exception e) {
-           Assert.assertEquals(blockingApi.getBlockingStateFor(bundle).getStateName(), expected);
+            Assert.assertEquals(blockingApi.getBlockingStateFor(bundle).getStateName(), expected);
         }
     }
 }

diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegration.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegration.java
index 060ea97..15910a3 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegration.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegration.java
@@ -16,10 +16,6 @@
 
 package com.ning.billing.beatrix.integration;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.UUID;
@@ -41,34 +37,38 @@ import com.ning.billing.entitlement.api.user.SubscriptionBundle;
 import com.ning.billing.entitlement.api.user.SubscriptionData;
 import com.ning.billing.invoice.api.Invoice;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
 @Test(groups = "slow")
 @Guice(modules = {BeatrixModule.class})
 public class TestIntegration extends TestIntegrationBase {
     @Test(groups = "slow", enabled = true)
     public void testBasePlanCompleteWithBillingDayInPast() throws Exception {
         log.info("Starting testBasePlanCompleteWithBillingDayInPast");
-        DateTime startDate = new DateTime(2012, 2, 1, 0, 3, 42, 0);
+        final DateTime startDate = new DateTime(2012, 2, 1, 0, 3, 42, 0);
         testBasePlanComplete(startDate, 31, false);
     }
 
     @Test(groups = "slow", enabled = true)
     public void testBasePlanCompleteWithBillingDayPresent() throws Exception {
         log.info("Starting testBasePlanCompleteWithBillingDayPresent");
-        DateTime startDate = new DateTime(2012, 2, 1, 0, 3, 42, 0);
+        final DateTime startDate = new DateTime(2012, 2, 1, 0, 3, 42, 0);
         testBasePlanComplete(startDate, 1, false);
     }
 
     @Test(groups = "slow", enabled = true)
     public void testBasePlanCompleteWithBillingDayAlignedWithTrial() throws Exception {
         log.info("Starting testBasePlanCompleteWithBillingDayAlignedWithTrial");
-        DateTime startDate = new DateTime(2012, 2, 1, 0, 3, 42, 0);
+        final DateTime startDate = new DateTime(2012, 2, 1, 0, 3, 42, 0);
         testBasePlanComplete(startDate, 2, false);
     }
 
     @Test(groups = "slow", enabled = true)
     public void testBasePlanCompleteWithBillingDayInFuture() throws Exception {
         log.info("Starting testBasePlanCompleteWithBillingDayInFuture");
-        DateTime startDate = new DateTime(2012, 2, 1, 0, 3, 42, 0);
+        final DateTime startDate = new DateTime(2012, 2, 1, 0, 3, 42, 0);
         testBasePlanComplete(startDate, 3, true);
     }
 
@@ -91,7 +91,7 @@ public class TestIntegration extends TestIntegrationBase {
             testBasePlanCompleteWithBillingDayInFuture();
         }
     }
-    
+
 
 //    // STEPH set to disabled until test written properly and fixed
 //    @Test(groups = "slow", enabled = true)
@@ -150,35 +150,35 @@ public class TestIntegration extends TestIntegrationBase {
 //        
 //        assertListenerStatus();
 //    }
-   
+
     // STEPH set to disabled until test written properly and fixed
     @Test(groups = "slow", enabled = false)
     public void testRepairChangeBPWithAddonIncluded() throws Exception {
-        
+
         log.info("Starting testRepairChangeBPWithAddonIncluded");
-        
-        DateTime initialDate = new DateTime(2012, 4, 25, 0, 13, 42, 0);
+
+        final DateTime initialDate = new DateTime(2012, 4, 25, 0, 13, 42, 0);
         clock.setDeltaFromReality(initialDate.getMillis() - clock.getUTCNow().getMillis());
-        
-        Account account = createAccountWithPaymentMethod(getAccountData(25));
+
+        final Account account = createAccountWithPaymentMethod(getAccountData(25));
         assertNotNull(account);
 
-        SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "whatever", context);
+        final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "whatever", context);
 
-        String productName = "Shotgun";
-        BillingPeriod term = BillingPeriod.MONTHLY;
-        String planSetName = PriceListSet.DEFAULT_PRICELIST_NAME;
+        final String productName = "Shotgun";
+        final BillingPeriod term = BillingPeriod.MONTHLY;
+        final String planSetName = PriceListSet.DEFAULT_PRICELIST_NAME;
 
         busHandler.pushExpectedEvent(NextEvent.CREATE);
         busHandler.pushExpectedEvent(NextEvent.INVOICE);
-        SubscriptionData baseSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
-                new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, context));
+        final SubscriptionData baseSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+                                                                                                                   new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, context));
         assertNotNull(baseSubscription);
         assertTrue(busHandler.isCompleted(DELAY));
         assertListenerStatus();
-   
+
         // MOVE CLOCK A LITTLE BIT-- STILL IN TRIAL
-        Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(3));
+        final Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(3));
         log.info("Moving clock from" + clock.getUTCNow() + " to " + clock.getUTCNow().plusDays(3));
         clock.addDays(3);
 
@@ -186,22 +186,22 @@ public class TestIntegration extends TestIntegrationBase {
         busHandler.pushExpectedEvent(NextEvent.INVOICE);
         busHandler.pushExpectedEvent(NextEvent.PAYMENT);
         subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
-                new PlanPhaseSpecifier("Telescopic-Scope", ProductCategory.ADD_ON, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, null), null, context));
+                                                                               new PlanPhaseSpecifier("Telescopic-Scope", ProductCategory.ADD_ON, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, null), null, context));
         assertTrue(busHandler.isCompleted(DELAY));
         assertListenerStatus();
 
-        
+
         busHandler.pushExpectedEvent(NextEvent.CREATE);
         busHandler.pushExpectedEvent(NextEvent.INVOICE);
         busHandler.pushExpectedEvent(NextEvent.PAYMENT);
-        SubscriptionData aoSubscription2 = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
-                new PlanPhaseSpecifier("Laser-Scope", ProductCategory.ADD_ON, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, null), null, context)); 
+        final SubscriptionData aoSubscription2 = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+                                                                                                                  new PlanPhaseSpecifier("Laser-Scope", ProductCategory.ADD_ON, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, null), null, context));
         assertTrue(busHandler.isCompleted(DELAY));
         assertListenerStatus();
 
         // MOVE CLOCK A LITTLE BIT MORE -- EITHER STAY IN TRIAL OR GET OUT   
         busHandler.pushExpectedEvent(NextEvent.PHASE);
-        busHandler.pushExpectedEvent(NextEvent.PHASE);          
+        busHandler.pushExpectedEvent(NextEvent.PHASE);
         busHandler.pushExpectedEvent(NextEvent.INVOICE);
         busHandler.pushExpectedEvent(NextEvent.PAYMENT);
         busHandler.pushExpectedEvent(NextEvent.INVOICE);
@@ -210,67 +210,66 @@ public class TestIntegration extends TestIntegrationBase {
         clock.addDays(28);// 26 / 5
         assertTrue(busHandler.isCompleted(DELAY));
         assertListenerStatus();
-        
-        
-        busHandler.pushExpectedEvent(NextEvent.PHASE);       
+
+
+        busHandler.pushExpectedEvent(NextEvent.PHASE);
         busHandler.pushExpectedEvent(NextEvent.INVOICE);
         busHandler.pushExpectedEvent(NextEvent.PAYMENT);
         log.info("Moving clock from" + clock.getUTCNow() + " to " + clock.getUTCNow().plusDays(3));
         clock.addDays(3);// 29 / 5
         assertTrue(busHandler.isCompleted(DELAY));
         assertListenerStatus();
-       
-        
+
+
         log.info("Moving clock from" + clock.getUTCNow() + " to " + clock.getUTCNow().plusDays(10));
         clock.addDays(10);// 8 / 6
         assertTrue(busHandler.isCompleted(DELAY));
         assertListenerStatus();
-       
-        
-       
+
+
         busHandler.pushExpectedEvent(NextEvent.INVOICE);
         busHandler.pushExpectedEvent(NextEvent.PAYMENT);
         log.info("Moving clock from" + clock.getUTCNow() + " to " + clock.getUTCNow().plusDays(18));
         clock.addDays(18);// 26 / 6
         assertTrue(busHandler.isCompleted(DELAY));
         assertListenerStatus();
-        
+
         log.info("Moving clock from" + clock.getUTCNow() + " to " + clock.getUTCNow().plusDays(3));
         clock.addDays(3);
         assertTrue(busHandler.isCompleted(DELAY));
         assertListenerStatus();
-        
+
 
     }
-    
-    
+
+
     @Test(groups = {"slow"})
     public void testRepairForInvoicing() throws Exception {
 
         log.info("Starting testRepairForInvoicing");
 
-        Account account = createAccountWithPaymentMethod(getAccountData(1));
-        UUID accountId = account.getId();
+        final Account account = createAccountWithPaymentMethod(getAccountData(1));
+        final UUID accountId = account.getId();
         assertNotNull(account);
 
-        DateTime initialDate = new DateTime(2012, 4, 25, 0, 3, 42, 0);
+        final DateTime initialDate = new DateTime(2012, 4, 25, 0, 3, 42, 0);
         clock.setDeltaFromReality(initialDate.getMillis() - clock.getUTCNow().getMillis());
 
-        SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "someBundle", context);
+        final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "someBundle", context);
         assertNotNull(bundle);
 
-        String productName = "Shotgun";
-        BillingPeriod term = BillingPeriod.MONTHLY;
-        String planSetName = PriceListSet.DEFAULT_PRICELIST_NAME;
+        final String productName = "Shotgun";
+        final BillingPeriod term = BillingPeriod.MONTHLY;
+        final String planSetName = PriceListSet.DEFAULT_PRICELIST_NAME;
         entitlementUserApi.createSubscription(bundle.getId(),
-                new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, context);
+                                              new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, context);
 
         busHandler.reset();
         busHandler.pushExpectedEvent(NextEvent.CREATE);
         busHandler.pushExpectedEvent(NextEvent.INVOICE);
         assertTrue(busHandler.isCompleted(DELAY));
 
-        List<Invoice> invoices = invoiceUserApi.getInvoicesByAccount(accountId);
+        final List<Invoice> invoices = invoiceUserApi.getInvoicesByAccount(accountId);
         assertEquals(invoices.size(), 1);
 
         // TODO: Jeff implement repair
@@ -281,17 +280,17 @@ public class TestIntegration extends TestIntegrationBase {
 
         log.info("Starting testWithRecreatePlan");
 
-        DateTime initialDate = new DateTime(2012, 2, 1, 0, 3, 42, 0);
-        int billingDay = 2;
+        final DateTime initialDate = new DateTime(2012, 2, 1, 0, 3, 42, 0);
+        final int billingDay = 2;
 
         log.info("Beginning test with BCD of " + billingDay);
-        Account account = createAccountWithPaymentMethod(getAccountData(billingDay));
-        UUID accountId = account.getId();
+        final Account account = createAccountWithPaymentMethod(getAccountData(billingDay));
+        final UUID accountId = account.getId();
         assertNotNull(account);
 
         // set clock to the initial start date
         clock.setDeltaFromReality(initialDate.getMillis() - clock.getUTCNow().getMillis());
-        SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "whatever2", context);
+        final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "whatever2", context);
 
         String productName = "Shotgun";
         BillingPeriod term = BillingPeriod.MONTHLY;
@@ -302,20 +301,20 @@ public class TestIntegration extends TestIntegrationBase {
         //
         busHandler.pushExpectedEvent(NextEvent.CREATE);
         busHandler.pushExpectedEvent(NextEvent.INVOICE);
-        
+
         SubscriptionData subscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
-                new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, context));
-        
+                                                                                                               new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, context));
+
         assertNotNull(subscription);
         assertTrue(busHandler.isCompleted(DELAY));
 
         //
         // VERIFY CTD HAS BEEN SET
         //
-        DateTime startDate = subscription.getCurrentPhaseStart();
+        final DateTime startDate = subscription.getCurrentPhaseStart();
         DateTime endDate = startDate.plusDays(30);
-        BigDecimal rate = subscription.getCurrentPhase().getFixedPrice().getPrice(Currency.USD);
-        int invoiceItemCount = 1;
+        final BigDecimal rate = subscription.getCurrentPhase().getFixedPrice().getPrice(Currency.USD);
+        final int invoiceItemCount = 1;
         verifyTestResult(accountId, subscription.getId(), startDate, endDate, rate, endDate, invoiceItemCount);
 
         //
@@ -333,7 +332,7 @@ public class TestIntegration extends TestIntegrationBase {
         // MOVE AFTER CANCEL DATE AND EXPECT EVENT : NextEvent.CANCEL
         busHandler.pushExpectedEvent(NextEvent.CANCEL);
         endDate = subscription.getChargedThroughDate();
-        Interval it = new Interval(clock.getUTCNow(), endDate);
+        final Interval it = new Interval(clock.getUTCNow(), endDate);
         clock.addDeltaFromReality(it.toDurationMillis());
         assertTrue(busHandler.isCompleted(DELAY));
 
@@ -349,21 +348,21 @@ public class TestIntegration extends TestIntegrationBase {
 
         assertListenerStatus();
     }
-     
-    private void testBasePlanComplete(DateTime initialCreationDate, int billingDay,
-                                      boolean proRationExpected) throws Exception {
+
+    private void testBasePlanComplete(final DateTime initialCreationDate, final int billingDay,
+                                      final boolean proRationExpected) throws Exception {
 
         log.info("Beginning test with BCD of " + billingDay);
-        Account account = createAccountWithPaymentMethod(getAccountData(billingDay));
-        UUID accountId = account.getId();
-        
+        final Account account = createAccountWithPaymentMethod(getAccountData(billingDay));
+        final UUID accountId = account.getId();
+
         // set clock to the initial start date
         clock.setDeltaFromReality(initialCreationDate.getMillis() - clock.getUTCNow().getMillis());
-        SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "whatever", context);
+        final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "whatever", context);
 
-        String productName = "Shotgun";
-        BillingPeriod term = BillingPeriod.MONTHLY;
-        String planSetName = PriceListSet.DEFAULT_PRICELIST_NAME;
+        final String productName = "Shotgun";
+        final BillingPeriod term = BillingPeriod.MONTHLY;
+        final String planSetName = PriceListSet.DEFAULT_PRICELIST_NAME;
 
         //
         // CREATE SUBSCRIPTION AND EXPECT BOTH EVENTS: NextEvent.CREATE NextEvent.INVOICE
@@ -371,7 +370,7 @@ public class TestIntegration extends TestIntegrationBase {
         busHandler.pushExpectedEvent(NextEvent.CREATE);
         busHandler.pushExpectedEvent(NextEvent.INVOICE);
         SubscriptionData subscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
-                new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, context));
+                                                                                                               new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, context));
         assertNotNull(subscription);
         assertTrue(busHandler.isCompleted(DELAY));
 
@@ -428,7 +427,7 @@ public class TestIntegration extends TestIntegrationBase {
         startDate = subscription.getCurrentPhaseStart();
         rate = subscription.getCurrentPhase().getRecurringPrice().getPrice(Currency.USD);
         BigDecimal price;
-        DateTime chargeThroughDate;
+        final DateTime chargeThroughDate;
 
         switch (billingDay) {
             case 1:
@@ -448,7 +447,7 @@ public class TestIntegration extends TestIntegrationBase {
             case 3:
                 // this will result in a 1-day leading pro-ration and a full-period invoice item
                 price = ONE.divide(TWENTY_NINE, 2 * NUMBER_OF_DECIMALS, ROUNDING_METHOD).multiply(rate).setScale(NUMBER_OF_DECIMALS, ROUNDING_METHOD);
-                DateTime firstEndDate = startDate.plusDays(1);
+                final DateTime firstEndDate = startDate.plusDays(1);
                 chargeThroughDate = firstEndDate.plusMonths(1);
                 invoiceItemCount += 2;
                 verifyTestResult(accountId, subscription.getId(), startDate, firstEndDate, price, chargeThroughDate, invoiceItemCount);
@@ -507,8 +506,8 @@ public class TestIntegration extends TestIntegrationBase {
             endDate = startDate.plusMonths(1);
             if (endDate.dayOfMonth().get() != billingDay) {
                 // adjust for end of month issues
-                int maximumDay = endDate.dayOfMonth().getMaximumValue();
-                int newDay = (maximumDay < billingDay) ? maximumDay : billingDay;
+                final int maximumDay = endDate.dayOfMonth().getMaximumValue();
+                final int newDay = (maximumDay < billingDay) ? maximumDay : billingDay;
                 endDate = endDate.toMutableDateTime().dayOfMonth().set(newDay).toDateTime();
             }
 
@@ -524,7 +523,7 @@ public class TestIntegration extends TestIntegrationBase {
 
         // MOVE AFTER CANCEL DATE AND EXPECT EVENT : NextEvent.CANCEL
         busHandler.pushExpectedEvent(NextEvent.CANCEL);
-        Interval it = new Interval(clock.getUTCNow(), endDate);
+        final Interval it = new Interval(clock.getUTCNow(), endDate);
         clock.addDeltaFromReality(it.toDurationMillis());
         assertTrue(busHandler.isCompleted(DELAY));
 
@@ -536,16 +535,16 @@ public class TestIntegration extends TestIntegrationBase {
         assertTrue(busHandler.isCompleted(DELAY));
 
         subscription = subscriptionDataFromSubscription(entitlementUserApi.getSubscriptionFromId(subscription.getId()));
-        DateTime lastCtd = subscription.getChargedThroughDate();
+        final DateTime lastCtd = subscription.getChargedThroughDate();
         assertNotNull(lastCtd);
         log.info("Checking CTD: " + lastCtd.toString() + "; clock is " + clock.getUTCNow().toString());
         assertTrue(lastCtd.isBefore(clock.getUTCNow()));
 
         // The invoice system is still working to verify there is nothing to do
         Thread.sleep(DELAY);
-        
+
         assertListenerStatus();
-        
+
         log.info("TEST PASSED !");
     }
 
@@ -554,66 +553,66 @@ public class TestIntegration extends TestIntegrationBase {
     public void testForMultipleRecurringPhases() throws Exception {
 
         log.info("Starting testForMultipleRecurringPhases");
-        
-        DateTime initialCreationDate = new DateTime(2012, 2, 1, 0, 3, 42, 0);
+
+        final DateTime initialCreationDate = new DateTime(2012, 2, 1, 0, 3, 42, 0);
         clock.setDeltaFromReality(initialCreationDate.getMillis() - clock.getUTCNow().getMillis());
 
-        Account account = createAccountWithPaymentMethod(getAccountData(2));
-        UUID accountId = account.getId();
+        final Account account = createAccountWithPaymentMethod(getAccountData(2));
+        final UUID accountId = account.getId();
 
-        String productName = "Blowdart";
-        String planSetName = "DEFAULT";
+        final String productName = "Blowdart";
+        final String planSetName = "DEFAULT";
 
         busHandler.pushExpectedEvent(NextEvent.CREATE);
         busHandler.pushExpectedEvent(NextEvent.INVOICE);
-        SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(accountId, "testKey", context);
+        final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(accountId, "testKey", context);
         subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
-                                        new PlanPhaseSpecifier(productName, ProductCategory.BASE,
-                                        BillingPeriod.MONTHLY, planSetName, PhaseType.TRIAL), null, context));
+                                                                               new PlanPhaseSpecifier(productName, ProductCategory.BASE,
+                                                                                                      BillingPeriod.MONTHLY, planSetName, PhaseType.TRIAL), null, context));
 
         assertTrue(busHandler.isCompleted(DELAY));
         List<Invoice> invoices = invoiceUserApi.getInvoicesByAccount(accountId);
         assertNotNull(invoices);
         assertTrue(invoices.size() == 1);
-        
+
         busHandler.pushExpectedEvent(NextEvent.PHASE);
         busHandler.pushExpectedEvent(NextEvent.INVOICE);
         busHandler.pushExpectedEvent(NextEvent.PAYMENT);
         clock.addDeltaFromReality(AT_LEAST_ONE_MONTH_MS);
-        assertTrue(busHandler.isCompleted(DELAY));           
+        assertTrue(busHandler.isCompleted(DELAY));
         invoices = invoiceUserApi.getInvoicesByAccount(accountId);
         assertNotNull(invoices);
-        assertEquals(invoices.size(),2);
-      
+        assertEquals(invoices.size(), 2);
+
         for (int i = 0; i < 5; i++) {
-            log.info("============== loop number " + i +"=======================");
+            log.info("============== loop number " + i + "=======================");
             busHandler.pushExpectedEvent(NextEvent.INVOICE);
             busHandler.pushExpectedEvent(NextEvent.PAYMENT);
             clock.addDeltaFromReality(AT_LEAST_ONE_MONTH_MS);
-            assertTrue(busHandler.isCompleted(DELAY));           
+            assertTrue(busHandler.isCompleted(DELAY));
         }
-        
+
         busHandler.pushExpectedEvent(NextEvent.INVOICE);
         busHandler.pushExpectedEvent(NextEvent.PAYMENT);
         busHandler.pushExpectedEvent(NextEvent.PHASE);
         clock.addDeltaFromReality(AT_LEAST_ONE_MONTH_MS);
-        assertTrue(busHandler.isCompleted(DELAY));           
- 
+        assertTrue(busHandler.isCompleted(DELAY));
+
         invoices = invoiceUserApi.getInvoicesByAccount(accountId);
         assertNotNull(invoices);
-        assertEquals(invoices.size(),8);
+        assertEquals(invoices.size(), 8);
 
         for (int i = 0; i <= 5; i++) {
-            log.info("============== second loop number " + i +"=======================");
+            log.info("============== second loop number " + i + "=======================");
             busHandler.pushExpectedEvent(NextEvent.INVOICE);
             busHandler.pushExpectedEvent(NextEvent.PAYMENT);
             clock.addDeltaFromReality(AT_LEAST_ONE_MONTH_MS);
-            assertTrue(busHandler.isCompleted(DELAY));           
+            assertTrue(busHandler.isCompleted(DELAY));
         }
-               
+
         invoices = invoiceUserApi.getInvoicesByAccount(accountId);
         assertNotNull(invoices);
-        assertEquals(invoices.size(),14);
+        assertEquals(invoices.size(), 14);
 
         assertListenerStatus();
     }

diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java
index 99e5287..104928f 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java
@@ -15,11 +15,6 @@
  */
 package com.ning.billing.beatrix.integration;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
-
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -70,6 +65,11 @@ import com.ning.billing.util.callcontext.DefaultCallContextFactory;
 import com.ning.billing.util.callcontext.UserType;
 import com.ning.billing.util.clock.ClockMock;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
 public class TestIntegrationBase implements TestListenerStatus {
 
     protected static final int NUMBER_OF_DECIMALS = InvoicingConfiguration.getNumberOfDecimals();
@@ -81,7 +81,7 @@ public class TestIntegrationBase implements TestListenerStatus {
     protected static final BigDecimal THIRTY_ONE = new BigDecimal("31.0000").setScale(NUMBER_OF_DECIMALS);
 
     protected static final Logger log = LoggerFactory.getLogger(TestIntegration.class);
-    protected static long AT_LEAST_ONE_MONTH_MS =  31L * 24L * 3600L * 1000L;
+    protected static long AT_LEAST_ONE_MONTH_MS = 31L * 24L * 3600L * 1000L;
 
 
     protected static final long DELAY = 5000;
@@ -91,7 +91,7 @@ public class TestIntegrationBase implements TestListenerStatus {
 
     @Inject
     protected ClockMock clock;
-    
+
     protected CallContext context;
 
     @Inject
@@ -116,24 +116,24 @@ public class TestIntegrationBase implements TestListenerStatus {
 
     @Inject
     protected EntitlementTimelineApi repairApi;
-    
+
     @Inject
     protected InvoiceUserApi invoiceUserApi;
 
     @Inject
     protected PaymentApi paymentApi;
-    
+
     @Inject
     protected AccountUserApi accountUserApi;
 
     protected TestApiListener busHandler;
 
-    
+
     private boolean isListenerFailed;
     private String listenerFailedMsg;
-    
+
     @Override
-    public void failed(String msg) {
+    public void failed(final String msg) {
         isListenerFailed = true;
         listenerFailedMsg = msg;
     }
@@ -144,7 +144,7 @@ public class TestIntegrationBase implements TestListenerStatus {
         listenerFailedMsg = null;
     }
 
-    
+
     protected void assertListenerStatus() {
         if (isListenerFailed) {
             log.error(listenerFailedMsg);
@@ -152,8 +152,7 @@ public class TestIntegrationBase implements TestListenerStatus {
         }
     }
 
-    protected void setupMySQL() throws IOException
-    {
+    protected void setupMySQL() throws IOException {
         final String accountDdl = IOUtils.toString(TestIntegration.class.getResourceAsStream("/com/ning/billing/account/ddl.sql"));
         final String entitlementDdl = IOUtils.toString(TestIntegration.class.getResourceAsStream("/com/ning/billing/entitlement/ddl.sql"));
         final String invoiceDdl = IOUtils.toString(TestIntegration.class.getResourceAsStream("/com/ning/billing/invoice/ddl.sql"));
@@ -171,15 +170,15 @@ public class TestIntegrationBase implements TestListenerStatus {
         helper.initDb(junctionDb);
     }
 
-  
+
     @BeforeClass(groups = "slow")
-    public void setup() throws Exception{
+    public void setup() throws Exception {
 
         setupMySQL();
-        
+
         context = new DefaultCallContextFactory(clock).createCallContext("Integration Test", CallOrigin.TEST, UserType.TEST);
         busHandler = new TestApiListener(this);
-        
+
     }
 
     @AfterClass(groups = "slow")
@@ -193,13 +192,13 @@ public class TestIntegrationBase implements TestListenerStatus {
 
         log.warn("\n");
         log.warn("RESET TEST FRAMEWORK\n\n");
-        
+
         // Pre test cleanup
         helper.cleanupAllTables();
 
         clock.resetDeltaFromReality();
         resetTestListenerStatus();
-        
+
         // Start services
         lifecycle.fireStartupSequencePriorEventRegistration();
         busService.getBus().register(busHandler);
@@ -214,24 +213,24 @@ public class TestIntegrationBase implements TestListenerStatus {
 
         log.warn("DONE WITH TEST\n");
     }
-    
 
-    protected void verifyTestResult(UUID accountId, UUID subscriptionId,
-                                  DateTime startDate, DateTime endDate,
-                                  BigDecimal amount, DateTime chargeThroughDate,
-                                  int totalInvoiceItemCount) throws EntitlementUserApiException {
-        SubscriptionData subscription = subscriptionDataFromSubscription(entitlementUserApi.getSubscriptionFromId(subscriptionId));
 
-        List<Invoice> invoices = invoiceUserApi.getInvoicesByAccount(accountId);
-        List<InvoiceItem> invoiceItems = new ArrayList<InvoiceItem>();
-        for (Invoice invoice : invoices) {
+    protected void verifyTestResult(final UUID accountId, final UUID subscriptionId,
+                                    final DateTime startDate, final DateTime endDate,
+                                    final BigDecimal amount, final DateTime chargeThroughDate,
+                                    final int totalInvoiceItemCount) throws EntitlementUserApiException {
+        final SubscriptionData subscription = subscriptionDataFromSubscription(entitlementUserApi.getSubscriptionFromId(subscriptionId));
+
+        final List<Invoice> invoices = invoiceUserApi.getInvoicesByAccount(accountId);
+        final List<InvoiceItem> invoiceItems = new ArrayList<InvoiceItem>();
+        for (final Invoice invoice : invoices) {
             invoiceItems.addAll(invoice.getInvoiceItems());
         }
         assertEquals(invoiceItems.size(), totalInvoiceItemCount);
 
         boolean wasFound = false;
 
-        for (InvoiceItem item : invoiceItems) {
+        for (final InvoiceItem item : invoiceItems) {
             if (item.getStartDate().compareTo(startDate) == 0) {
                 if (item.getEndDate().compareTo(endDate) == 0) {
                     if (item.getAmount().compareTo(amount) == 0) {
@@ -246,34 +245,37 @@ public class TestIntegrationBase implements TestListenerStatus {
             fail();
         }
 
-        DateTime ctd = subscription.getChargedThroughDate();
+        final DateTime ctd = subscription.getChargedThroughDate();
         assertNotNull(ctd);
         log.info("Checking CTD: " + ctd.toString() + "; clock is " + clock.getUTCNow().toString());
         assertTrue(clock.getUTCNow().isBefore(ctd));
         assertTrue(ctd.compareTo(chargeThroughDate) == 0);
     }
-       
-    protected SubscriptionData subscriptionDataFromSubscription(Subscription sub) {
-        return (SubscriptionData)((BlockingSubscription)sub).getDelegateSubscription();
+
+    protected SubscriptionData subscriptionDataFromSubscription(final Subscription sub) {
+        return (SubscriptionData) ((BlockingSubscription) sub).getDelegateSubscription();
     }
-    
-    protected Account createAccountWithPaymentMethod(AccountData accountData) throws Exception {
-        Account account = accountUserApi.createAccount(accountData, context);
+
+    protected Account createAccountWithPaymentMethod(final AccountData accountData) throws Exception {
+        final Account account = accountUserApi.createAccount(accountData, context);
         assertNotNull(account);
-        
-        PaymentMethodPlugin info = new PaymentMethodPlugin() {
+
+        final PaymentMethodPlugin info = new PaymentMethodPlugin() {
             @Override
             public boolean isDefaultPaymentMethod() {
                 return false;
             }
+
             @Override
-            public String getValueString(String key) {
+            public String getValueString(final String key) {
                 return null;
             }
+
             @Override
             public List<PaymentMethodKVInfo> getProperties() {
                 return null;
             }
+
             @Override
             public String getExternalPaymentMethodId() {
                 return UUID.randomUUID().toString();
@@ -283,7 +285,7 @@ public class TestIntegrationBase implements TestListenerStatus {
         return accountUserApi.getAccountById(account.getId());
     }
 
-    
+
     protected AccountData getAccountData(final int billingDay) {
 
         final String someRandomKey = RandomStringUtils.randomAlphanumeric(10);
@@ -292,14 +294,17 @@ public class TestIntegrationBase implements TestListenerStatus {
             public String getName() {
                 return "firstName lastName";
             }
+
             @Override
             public int getFirstNameLength() {
                 return "firstName".length();
             }
+
             @Override
             public String getEmail() {
-                return  someRandomKey + "@laposte.fr";
+                return someRandomKey + "@laposte.fr";
             }
+
             @Override
             public String getPhone() {
                 return "4152876341";
@@ -319,14 +324,17 @@ public class TestIntegrationBase implements TestListenerStatus {
             public String getExternalKey() {
                 return someRandomKey;
             }
+
             @Override
             public int getBillCycleDay() {
                 return billingDay;
             }
+
             @Override
             public Currency getCurrency() {
                 return Currency.USD;
             }
+
             @Override
             public UUID getPaymentMethodId() {
                 return null;

diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationWithAutoInvoiceOffTag.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationWithAutoInvoiceOffTag.java
index 08ba27a..426bac7 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationWithAutoInvoiceOffTag.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationWithAutoInvoiceOffTag.java
@@ -16,10 +16,6 @@
 
 package com.ning.billing.beatrix.integration;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
 import java.util.Collection;
 import java.util.Map;
 import java.util.UUID;
@@ -48,6 +44,10 @@ import com.ning.billing.util.tag.ControlTagType;
 import com.ning.billing.util.tag.Tag;
 import com.ning.billing.util.tag.TagDefinition;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
 @Guice(modules = {BeatrixModule.class})
 public class TestIntegrationWithAutoInvoiceOffTag extends TestIntegrationBase {
 
@@ -65,7 +65,7 @@ public class TestIntegrationWithAutoInvoiceOffTag extends TestIntegrationBase {
 
     @BeforeMethod(groups = {"slow"})
     public void setupOverdue() throws Exception {
-        
+
         account = createAccountWithPaymentMethod(getAccountData(25));
         assertNotNull(account);
 
@@ -76,51 +76,51 @@ public class TestIntegrationWithAutoInvoiceOffTag extends TestIntegrationBase {
         planSetName = PriceListSet.DEFAULT_PRICELIST_NAME;
     }
 
-    @Test(groups={"slow"}, enabled = true)
+    @Test(groups = {"slow"}, enabled = true)
     public void testAutoInvoiceOffAccount() throws Exception {
         clock.setTime(new DateTime(2012, 5, 1, 0, 3, 42, 0));
         addTag(account.getId(), ObjectType.ACCOUNT);
-       
+
         // set next invoice to fail and create network 
         busHandler.pushExpectedEvents(NextEvent.CREATE);
-        SubscriptionData baseSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
-                new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, context));
+        final SubscriptionData baseSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+                                                                                                                   new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, context));
         assertNotNull(baseSubscription);
         assertTrue(busHandler.isCompleted(DELAY));
 
- 
-        Collection<Invoice> invoices = invoiceApi.getInvoicesByAccount(account.getId());       
+
+        Collection<Invoice> invoices = invoiceApi.getInvoicesByAccount(account.getId());
         assertEquals(invoices.size(), 0);
- 
+
         clock.addDays(10); // DAY 10 still in trial
         assertTrue(busHandler.isCompleted(DELAY));
 
-        invoices = invoiceApi.getInvoicesByAccount(account.getId());       
+        invoices = invoiceApi.getInvoicesByAccount(account.getId());
         assertEquals(invoices.size(), 0);
 
         busHandler.pushExpectedEvents(NextEvent.PHASE);
         clock.addDays(30); // DAY 40 out of trial
         assertTrue(busHandler.isCompleted(DELAY));
 
-        invoices = invoiceApi.getInvoicesByAccount(account.getId());       
+        invoices = invoiceApi.getInvoicesByAccount(account.getId());
         assertEquals(invoices.size(), 0);
 
     }
-    
-    @Test(groups={"slow"}, enabled = true)
+
+    @Test(groups = {"slow"}, enabled = true)
     public void testAutoInvoiceOffSingleSubscription() throws Exception {
         clock.setTime(new DateTime(2012, 5, 1, 0, 3, 42, 0));
-       
+
         // set next invoice to fail and create network 
-        busHandler.pushExpectedEvents(NextEvent.CREATE,NextEvent.INVOICE);
-        SubscriptionData baseSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
-                new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, context));
+        busHandler.pushExpectedEvents(NextEvent.CREATE, NextEvent.INVOICE);
+        final SubscriptionData baseSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+                                                                                                                   new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, context));
         assertNotNull(baseSubscription);
         assertTrue(busHandler.isCompleted(DELAY));
-        
-        Collection<Invoice> invoices = invoiceApi.getInvoicesByAccount(account.getId());       
+
+        Collection<Invoice> invoices = invoiceApi.getInvoicesByAccount(account.getId());
         assertEquals(invoices.size(), 1); // first invoice is generated immediately after creation can't reliably stop it
- 
+
 
         addTag(baseSubscription.getBundleId(), ObjectType.BUNDLE);
 
@@ -128,49 +128,49 @@ public class TestIntegrationWithAutoInvoiceOffTag extends TestIntegrationBase {
         clock.addDays(40); // DAY 40 out of trial
         assertTrue(busHandler.isCompleted(DELAY));
 
-        invoices = invoiceApi.getInvoicesByAccount(account.getId());       
+        invoices = invoiceApi.getInvoicesByAccount(account.getId());
         assertEquals(invoices.size(), 1); //No additional invoices generated
 
     }
 
-    
-    @Test(groups={"slow"}, enabled = true)
+
+    @Test(groups = {"slow"}, enabled = true)
     public void testAutoInvoiceOffMultipleSubscriptions() throws Exception {
         clock.setTime(new DateTime(2012, 5, 1, 0, 3, 42, 0));
-       
+
         // set next invoice to fail and create network 
-        busHandler.pushExpectedEvents(NextEvent.CREATE,NextEvent.INVOICE);
-        SubscriptionData baseSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
-                new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, context));
+        busHandler.pushExpectedEvents(NextEvent.CREATE, NextEvent.INVOICE);
+        final SubscriptionData baseSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+                                                                                                                   new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, context));
         assertNotNull(baseSubscription);
         assertTrue(busHandler.isCompleted(DELAY));
- 
-        SubscriptionBundle bundle2 = entitlementUserApi.createBundleForAccount(account.getId(), "whatever", context);
 
-        busHandler.pushExpectedEvents(NextEvent.CREATE,NextEvent.INVOICE);
-        SubscriptionData baseSubscription2 = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle2.getId(),
-                new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, context));
+        final SubscriptionBundle bundle2 = entitlementUserApi.createBundleForAccount(account.getId(), "whatever", context);
+
+        busHandler.pushExpectedEvents(NextEvent.CREATE, NextEvent.INVOICE);
+        final SubscriptionData baseSubscription2 = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle2.getId(),
+                                                                                                                    new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, context));
         assertNotNull(baseSubscription2);
         assertTrue(busHandler.isCompleted(DELAY));
 
-        Collection<Invoice> invoices = invoiceApi.getInvoicesByAccount(account.getId());       
+        Collection<Invoice> invoices = invoiceApi.getInvoicesByAccount(account.getId());
         assertEquals(invoices.size(), 2); // first invoice is generated immediately after creation can't reliably stop it
- 
+
         addTag(baseSubscription.getBundleId(), ObjectType.BUNDLE);
 
-        busHandler.pushExpectedEvents(NextEvent.PHASE,NextEvent.PHASE,NextEvent.INVOICE);
+        busHandler.pushExpectedEvents(NextEvent.PHASE, NextEvent.PHASE, NextEvent.INVOICE);
         clock.addDays(40); // DAY 40 out of trial
         assertTrue(busHandler.isCompleted(DELAY));
 
-        invoices = invoiceApi.getInvoicesByAccount(account.getId());       
+        invoices = invoiceApi.getInvoicesByAccount(account.getId());
         assertEquals(invoices.size(), 3); // Only one additional invoice generated
     }
 
 
-    private void addTag(UUID id, ObjectType type) throws TagDefinitionApiException, TagApiException {
-        TagDefinition def = tagApi.getTagDefinition(ControlTagType.AUTO_INVOICING_OFF.name());
+    private void addTag(final UUID id, final ObjectType type) throws TagDefinitionApiException, TagApiException {
+        final TagDefinition def = tagApi.getTagDefinition(ControlTagType.AUTO_INVOICING_OFF.name());
         tagApi.addTag(id, type, def, context);
-        Map<String,Tag> tags = tagApi.getTags(id, type);
+        final Map<String, Tag> tags = tagApi.getTags(id, type);
         assertNotNull(tags.get(ControlTagType.AUTO_INVOICING_OFF.name()));
     }
 }

diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestRepairIntegration.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestRepairIntegration.java
index 4000606..ae3ecc3 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestRepairIntegration.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestRepairIntegration.java
@@ -15,10 +15,6 @@
  */
 package com.ning.billing.beatrix.integration;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.LinkedList;
@@ -44,48 +40,52 @@ import com.ning.billing.entitlement.api.timeline.SubscriptionTimeline;
 import com.ning.billing.entitlement.api.timeline.SubscriptionTimeline.DeletedEvent;
 import com.ning.billing.entitlement.api.timeline.SubscriptionTimeline.ExistingEvent;
 import com.ning.billing.entitlement.api.timeline.SubscriptionTimeline.NewEvent;
+import com.ning.billing.entitlement.api.user.Subscription.SubscriptionState;
 import com.ning.billing.entitlement.api.user.SubscriptionBundle;
 import com.ning.billing.entitlement.api.user.SubscriptionData;
 import com.ning.billing.entitlement.api.user.SubscriptionEvents;
-import com.ning.billing.entitlement.api.user.Subscription.SubscriptionState;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
 
 @Test(groups = "slow")
 @Guice(modules = {BeatrixModule.class})
 public class TestRepairIntegration extends TestIntegrationBase {
 
-    
-    @Test(groups={"slow"}, enabled=false)
+
+    @Test(groups = {"slow"}, enabled = false)
     public void testRepairChangeBPWithAddonIncludedIntrial() throws Exception {
         log.info("Starting testRepairChangeBPWithAddonIncludedIntrial");
         testRepairChangeBPWithAddonIncluded(true);
     }
-    
-    @Test(groups={"slow"}, enabled=false)
+
+    @Test(groups = {"slow"}, enabled = false)
     public void testRepairChangeBPWithAddonIncludedOutOfTrial() throws Exception {
         log.info("Starting testRepairChangeBPWithAddonIncludedOutOfTrial");
         testRepairChangeBPWithAddonIncluded(false);
     }
-    
-    private void testRepairChangeBPWithAddonIncluded(boolean inTrial) throws Exception {
-        
-        DateTime initialDate = new DateTime(2012, 4, 25, 0, 3, 42, 0);
+
+    private void testRepairChangeBPWithAddonIncluded(final boolean inTrial) throws Exception {
+
+        final DateTime initialDate = new DateTime(2012, 4, 25, 0, 3, 42, 0);
         clock.setDeltaFromReality(initialDate.getMillis() - clock.getUTCNow().getMillis());
-        
-        Account account = createAccountWithPaymentMethod(getAccountData(25));
 
-        SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "whatever", context);
+        final Account account = createAccountWithPaymentMethod(getAccountData(25));
 
-        String productName = "Shotgun";
-        BillingPeriod term = BillingPeriod.MONTHLY;
-        String planSetName = PriceListSet.DEFAULT_PRICELIST_NAME;
+        final SubscriptionBundle bundle = entitlementUserApi.createBundleForAccount(account.getId(), "whatever", context);
+
+        final String productName = "Shotgun";
+        final BillingPeriod term = BillingPeriod.MONTHLY;
+        final String planSetName = PriceListSet.DEFAULT_PRICELIST_NAME;
 
         busHandler.pushExpectedEvent(NextEvent.CREATE);
         busHandler.pushExpectedEvent(NextEvent.INVOICE);
-        SubscriptionData baseSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
-                new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, context));
+        final SubscriptionData baseSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+                                                                                                                   new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSetName, null), null, context));
         assertNotNull(baseSubscription);
         assertTrue(busHandler.isCompleted(DELAY));
-   
+
         // MOVE CLOCK A LITTLE BIT-- STILL IN TRIAL
         Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(3));
         clock.addDeltaFromReality(it.toDurationMillis());
@@ -93,25 +93,25 @@ public class TestRepairIntegration extends TestIntegrationBase {
         busHandler.pushExpectedEvent(NextEvent.CREATE);
         busHandler.pushExpectedEvent(NextEvent.INVOICE);
         busHandler.pushExpectedEvent(NextEvent.PAYMENT);
-        SubscriptionData aoSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
-                new PlanPhaseSpecifier("Telescopic-Scope", ProductCategory.ADD_ON, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, null), null, context));
+        final SubscriptionData aoSubscription = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+                                                                                                                 new PlanPhaseSpecifier("Telescopic-Scope", ProductCategory.ADD_ON, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, null), null, context));
         assertTrue(busHandler.isCompleted(DELAY));
-        
+
         busHandler.pushExpectedEvent(NextEvent.CREATE);
         busHandler.pushExpectedEvent(NextEvent.INVOICE);
         busHandler.pushExpectedEvent(NextEvent.PAYMENT);
-        SubscriptionData aoSubscription2 = subscriptionDataFromSubscription( entitlementUserApi.createSubscription(bundle.getId(),
-                new PlanPhaseSpecifier("Laser-Scope", ProductCategory.ADD_ON, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, null), null, context)); 
+        final SubscriptionData aoSubscription2 = subscriptionDataFromSubscription(entitlementUserApi.createSubscription(bundle.getId(),
+                                                                                                                  new PlanPhaseSpecifier("Laser-Scope", ProductCategory.ADD_ON, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, null), null, context));
         assertTrue(busHandler.isCompleted(DELAY));
-        
+
 
         // MOVE CLOCK A LITTLE BIT MORE -- EITHER STAY IN TRIAL OR GET OUT   
-        int duration = inTrial ? 3 : 35;
+        final int duration = inTrial ? 3 : 35;
         it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(duration));
         if (!inTrial) {
             busHandler.pushExpectedEvent(NextEvent.PHASE);
             busHandler.pushExpectedEvent(NextEvent.PHASE);
-            busHandler.pushExpectedEvent(NextEvent.PHASE);            
+            busHandler.pushExpectedEvent(NextEvent.PHASE);
             busHandler.pushExpectedEvent(NextEvent.INVOICE);
             busHandler.pushExpectedEvent(NextEvent.PAYMENT);
         }
@@ -119,7 +119,7 @@ public class TestRepairIntegration extends TestIntegrationBase {
         if (!inTrial) {
             assertTrue(busHandler.isCompleted(DELAY));
         }
-        boolean ifRepair = false;
+        final boolean ifRepair = false;
         if (ifRepair) {
             BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
             sortEventsOnBundle(bundleRepair);
@@ -128,23 +128,23 @@ public class TestRepairIntegration extends TestIntegrationBase {
             SubscriptionTimeline bpRepair = getSubscriptionRepair(baseSubscription.getId(), bundleRepair);
             assertEquals(bpRepair.getExistingEvents().size(), 2);
 
-            SubscriptionTimeline aoRepair = getSubscriptionRepair(aoSubscription.getId(), bundleRepair);
+            final SubscriptionTimeline aoRepair = getSubscriptionRepair(aoSubscription.getId(), bundleRepair);
             assertEquals(aoRepair.getExistingEvents().size(), 2);
 
-            SubscriptionTimeline aoRepair2 = getSubscriptionRepair(aoSubscription2.getId(), bundleRepair);
+            final SubscriptionTimeline aoRepair2 = getSubscriptionRepair(aoSubscription2.getId(), bundleRepair);
             assertEquals(aoRepair2.getExistingEvents().size(), 2);
 
-            DateTime bpChangeDate = clock.getUTCNow().minusDays(1);
+            final DateTime bpChangeDate = clock.getUTCNow().minusDays(1);
 
-            List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
-            des.add(createDeletedEvent(bpRepair.getExistingEvents().get(1).getEventId()));        
+            final List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
+            des.add(createDeletedEvent(bpRepair.getExistingEvents().get(1).getEventId()));
 
-            PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Assault-Rifle", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.TRIAL);
-            NewEvent ne = createNewEvent(SubscriptionTransitionType.CHANGE, bpChangeDate, spec);
+            final PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Assault-Rifle", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.TRIAL);
+            final NewEvent ne = createNewEvent(SubscriptionTransitionType.CHANGE, bpChangeDate, spec);
 
             bpRepair = createSubscriptionReapir(baseSubscription.getId(), des, Collections.singletonList(ne));
 
-            bundleRepair =  createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(bpRepair));
+            bundleRepair = createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(bpRepair));
 
             // TIME TO  REPAIR
             busHandler.pushExpectedEvent(NextEvent.INVOICE);
@@ -153,40 +153,43 @@ public class TestRepairIntegration extends TestIntegrationBase {
             repairApi.repairBundle(bundleRepair, false, context);
             assertTrue(busHandler.isCompleted(DELAY));
 
-            SubscriptionData newAoSubscription = subscriptionDataFromSubscription(  entitlementUserApi.getSubscriptionFromId(aoSubscription.getId()));
+            final SubscriptionData newAoSubscription = subscriptionDataFromSubscription(entitlementUserApi.getSubscriptionFromId(aoSubscription.getId()));
             assertEquals(newAoSubscription.getState(), SubscriptionState.CANCELLED);
             assertEquals(newAoSubscription.getAllTransitions().size(), 2);
             assertEquals(newAoSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
 
-            SubscriptionData newAoSubscription2 = subscriptionDataFromSubscription(  entitlementUserApi.getSubscriptionFromId(aoSubscription2.getId()));
+            final SubscriptionData newAoSubscription2 = subscriptionDataFromSubscription(entitlementUserApi.getSubscriptionFromId(aoSubscription2.getId()));
             assertEquals(newAoSubscription2.getState(), SubscriptionState.ACTIVE);
             assertEquals(newAoSubscription2.getAllTransitions().size(), 2);
             assertEquals(newAoSubscription2.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
 
 
-            SubscriptionData newBaseSubscription = subscriptionDataFromSubscription(  entitlementUserApi.getSubscriptionFromId(baseSubscription.getId()));
+            final SubscriptionData newBaseSubscription = subscriptionDataFromSubscription(entitlementUserApi.getSubscriptionFromId(baseSubscription.getId()));
             assertEquals(newBaseSubscription.getState(), SubscriptionState.ACTIVE);
             assertEquals(newBaseSubscription.getAllTransitions().size(), 3);
             assertEquals(newBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
 
             assertListenerStatus();
         }
-     }
-    
+    }
+
     protected SubscriptionTimeline createSubscriptionReapir(final UUID id, final List<DeletedEvent> deletedEvents, final List<NewEvent> newEvents) {
         return new SubscriptionTimeline() {
             @Override
             public UUID getId() {
                 return id;
             }
+
             @Override
             public List<NewEvent> getNewEvents() {
                 return newEvents;
             }
+
             @Override
             public List<ExistingEvent> getExistingEvents() {
                 return null;
             }
+
             @Override
             public List<DeletedEvent> getDeletedEvents() {
                 return deletedEvents;
@@ -194,21 +197,24 @@ public class TestRepairIntegration extends TestIntegrationBase {
         };
     }
 
-    
+
     protected BundleTimeline createBundleRepair(final UUID bundleId, final String viewId, final List<SubscriptionTimeline> subscriptionRepair) {
         return new BundleTimeline() {
             @Override
             public String getViewId() {
                 return viewId;
             }
+
             @Override
             public List<SubscriptionTimeline> getSubscriptions() {
                 return subscriptionRepair;
             }
+
             @Override
             public UUID getBundleId() {
                 return bundleId;
             }
+
             @Override
             public String getExternalKey() {
                 return null;
@@ -216,28 +222,32 @@ public class TestRepairIntegration extends TestIntegrationBase {
         };
     }
 
-    protected ExistingEvent createExistingEventForAssertion(final SubscriptionTransitionType type, 
-            final String productName, final PhaseType phaseType, final ProductCategory category, final String priceListName, final BillingPeriod billingPeriod,
-            final DateTime effectiveDateTime) {
+    protected ExistingEvent createExistingEventForAssertion(final SubscriptionTransitionType type,
+                                                            final String productName, final PhaseType phaseType, final ProductCategory category, final String priceListName, final BillingPeriod billingPeriod,
+                                                            final DateTime effectiveDateTime) {
 
         final PlanPhaseSpecifier spec = new PlanPhaseSpecifier(productName, category, billingPeriod, priceListName, phaseType);
-        ExistingEvent ev = new ExistingEvent() {
+        final ExistingEvent ev = new ExistingEvent() {
             @Override
             public SubscriptionTransitionType getSubscriptionTransitionType() {
                 return type;
             }
-             @Override
+
+            @Override
             public DateTime getRequestedDate() {
-                 return null;
+                return null;
             }
+
             @Override
             public PlanPhaseSpecifier getPlanPhaseSpecifier() {
                 return spec;
             }
+
             @Override
             public UUID getEventId() {
                 return null;
             }
+
             @Override
             public DateTime getEffectiveDate() {
                 return effectiveDateTime;
@@ -245,9 +255,9 @@ public class TestRepairIntegration extends TestIntegrationBase {
         };
         return ev;
     }
-    
+
     protected SubscriptionTimeline getSubscriptionRepair(final UUID id, final BundleTimeline bundleRepair) {
-        for (SubscriptionTimeline cur : bundleRepair.getSubscriptions()) {
+        for (final SubscriptionTimeline cur : bundleRepair.getSubscriptions()) {
             if (cur.getId().equals(id)) {
                 return cur;
             }
@@ -255,22 +265,23 @@ public class TestRepairIntegration extends TestIntegrationBase {
         Assert.fail("Failed to find SubscriptionReapir " + id);
         return null;
     }
+
     protected void validateExistingEventForAssertion(final ExistingEvent expected, final ExistingEvent input) {
-        
+
         log.info(String.format("Got %s -> Expected %s", input.getPlanPhaseSpecifier().getProductName(), expected.getPlanPhaseSpecifier().getProductName()));
         assertEquals(input.getPlanPhaseSpecifier().getProductName(), expected.getPlanPhaseSpecifier().getProductName());
         log.info(String.format("Got %s -> Expected %s", input.getPlanPhaseSpecifier().getPhaseType(), expected.getPlanPhaseSpecifier().getPhaseType()));
         assertEquals(input.getPlanPhaseSpecifier().getPhaseType(), expected.getPlanPhaseSpecifier().getPhaseType());
         log.info(String.format("Got %s -> Expected %s", input.getPlanPhaseSpecifier().getProductCategory(), expected.getPlanPhaseSpecifier().getProductCategory()));
-        assertEquals(input.getPlanPhaseSpecifier().getProductCategory(), expected.getPlanPhaseSpecifier().getProductCategory());                    
+        assertEquals(input.getPlanPhaseSpecifier().getProductCategory(), expected.getPlanPhaseSpecifier().getProductCategory());
         log.info(String.format("Got %s -> Expected %s", input.getPlanPhaseSpecifier().getPriceListName(), expected.getPlanPhaseSpecifier().getPriceListName()));
-        assertEquals(input.getPlanPhaseSpecifier().getPriceListName(), expected.getPlanPhaseSpecifier().getPriceListName());                    
+        assertEquals(input.getPlanPhaseSpecifier().getPriceListName(), expected.getPlanPhaseSpecifier().getPriceListName());
         log.info(String.format("Got %s -> Expected %s", input.getPlanPhaseSpecifier().getBillingPeriod(), expected.getPlanPhaseSpecifier().getBillingPeriod()));
         assertEquals(input.getPlanPhaseSpecifier().getBillingPeriod(), expected.getPlanPhaseSpecifier().getBillingPeriod());
         log.info(String.format("Got %s -> Expected %s", input.getEffectiveDate(), expected.getEffectiveDate()));
-        assertEquals(input.getEffectiveDate(), expected.getEffectiveDate());        
+        assertEquals(input.getEffectiveDate(), expected.getEffectiveDate());
     }
-    
+
     protected DeletedEvent createDeletedEvent(final UUID eventId) {
         return new DeletedEvent() {
             @Override
@@ -287,10 +298,12 @@ public class TestRepairIntegration extends TestIntegrationBase {
             public SubscriptionTransitionType getSubscriptionTransitionType() {
                 return type;
             }
+
             @Override
             public DateTime getRequestedDate() {
                 return requestedDate;
             }
+
             @Override
             public PlanPhaseSpecifier getPlanPhaseSpecifier() {
                 return spec;
@@ -302,7 +315,7 @@ public class TestRepairIntegration extends TestIntegrationBase {
         if (bundle.getSubscriptions() == null) {
             return;
         }
-        for (SubscriptionTimeline cur : bundle.getSubscriptions()) {
+        for (final SubscriptionTimeline cur : bundle.getSubscriptions()) {
             if (cur.getExistingEvents() != null) {
                 sortExistingEvent(cur.getExistingEvents());
             }
@@ -315,15 +328,16 @@ public class TestRepairIntegration extends TestIntegrationBase {
     protected void sortExistingEvent(final List<ExistingEvent> events) {
         Collections.sort(events, new Comparator<ExistingEvent>() {
             @Override
-            public int compare(ExistingEvent arg0, ExistingEvent arg1) {
+            public int compare(final ExistingEvent arg0, final ExistingEvent arg1) {
                 return arg0.getEffectiveDate().compareTo(arg1.getEffectiveDate());
             }
         });
     }
+
     protected void sortNewEvent(final List<NewEvent> events) {
         Collections.sort(events, new Comparator<NewEvent>() {
             @Override
-            public int compare(NewEvent arg0, NewEvent arg1) {
+            public int compare(final NewEvent arg0, final NewEvent arg1) {
                 return arg0.getRequestedDate().compareTo(arg1.getRequestedDate());
             }
         });

diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/lifecycle/TestLifecycle.java b/beatrix/src/test/java/com/ning/billing/beatrix/lifecycle/TestLifecycle.java
index f60d61f..ac41b0e 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/lifecycle/TestLifecycle.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/lifecycle/TestLifecycle.java
@@ -16,6 +16,12 @@
 
 package com.ning.billing.beatrix.lifecycle;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
 import com.google.inject.Inject;
@@ -24,16 +30,11 @@ import com.google.inject.Stage;
 import com.ning.billing.lifecycle.KillbillService;
 import com.ning.billing.lifecycle.LifecycleHandlerType;
 import com.ning.billing.lifecycle.LifecycleHandlerType.LifecycleLevel;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.Assert;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
 
 
 public class TestLifecycle {
 
-    private final static Logger log = LoggerFactory.getLogger(TestLifecycle.class);
+    private static final Logger log = LoggerFactory.getLogger(TestLifecycle.class);
 
     private Service1 s1;
     private Service2 s2;
@@ -61,7 +62,7 @@ public class TestLifecycle {
         }
     }
 
-    public static class Service1 extends ServiceBase implements KillbillService  {
+    public static class Service1 extends ServiceBase implements KillbillService {
 
         @LifecycleHandlerType(LifecycleLevel.INIT_BUS)
         public void initBus() {
@@ -120,8 +121,7 @@ public class TestLifecycle {
     }
 
 
-
-    @BeforeClass(alwaysRun=true)
+    @BeforeClass(alwaysRun = true)
     public void setup() {
         final Injector g = Guice.createInjector(Stage.DEVELOPMENT, new TestLifecycleModule());
         s1 = g.getInstance(Service1.class);
@@ -129,7 +129,7 @@ public class TestLifecycle {
         lifecycle = g.getInstance(DefaultLifecycle.class);
     }
 
-    @Test(enabled=true, groups={"fast"})
+    @Test(enabled = true, groups = {"fast"})
     public void testLifecycle() {
         s1.reset();
         s2.reset();
@@ -155,11 +155,12 @@ public class TestLifecycle {
     public static class LifecycleNoWarn extends DefaultLifecycle {
 
         @Inject
-        public LifecycleNoWarn(Injector injector) {
+        public LifecycleNoWarn(final Injector injector) {
             super(injector);
         }
+
         @Override
-        protected void logWarn(String msg, Exception e) {
+        protected void logWarn(final String msg, final Exception e) {
         }
     }
 

diff --git a/catalog/pom.xml b/catalog/pom.xml
index a3660cf..413f72c 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -8,7 +8,8 @@
     OR CONDITIONS OF ANY KIND, either express or implied. See the ~ License for 
     the specific language governing permissions and limitations ~ under the License. -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.ning.billing</groupId>
@@ -62,7 +63,7 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-     <build>
+    <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/catalog/src/main/java/com/ning/billing/catalog/DefaultCatalogService.java b/catalog/src/main/java/com/ning/billing/catalog/DefaultCatalogService.java
index 2ed1cfa..11a42c7 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/DefaultCatalogService.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/DefaultCatalogService.java
@@ -37,11 +37,11 @@ public class DefaultCatalogService implements KillbillService, Provider<Catalog>
     private final CatalogConfig config;
     private boolean isInitialized;
 
-	private VersionedCatalogLoader loader;
+    private final VersionedCatalogLoader loader;
 
 
     @Inject
-    public DefaultCatalogService(CatalogConfig config, VersionedCatalogLoader loader) {
+    public DefaultCatalogService(final CatalogConfig config, final VersionedCatalogLoader loader) {
         this.config = config;
         this.isInitialized = false;
         this.loader = loader;
@@ -51,8 +51,8 @@ public class DefaultCatalogService implements KillbillService, Provider<Catalog>
     public synchronized void loadCatalog() throws ServiceException {
         if (!isInitialized) {
             try {
-            	String url = config.getCatalogURI();
-            	catalog = loader.load(url);
+                final String url = config.getCatalogURI();
+                catalog = loader.load(url);
 
                 //catalog = XMLLoader.getObjectFromProperty(config.getCatalogURI(), Catalog.class);
                 isInitialized = true;
@@ -69,10 +69,9 @@ public class DefaultCatalogService implements KillbillService, Provider<Catalog>
     }
 
 
-
     /* (non-Javadoc)
-     * @see com.ning.billing.catalog.ICatlogService#getCatalog()
-     */
+    * @see com.ning.billing.catalog.ICatlogService#getCatalog()
+    */
     @Override
     public Catalog getFullCatalog() {
         return catalog;
@@ -85,9 +84,9 @@ public class DefaultCatalogService implements KillbillService, Provider<Catalog>
         return catalog;
     }
 
-	@Override
-	public StaticCatalog getCurrentCatalog() {
-		return catalog;
-	}
+    @Override
+    public StaticCatalog getCurrentCatalog() {
+        return catalog;
+    }
 
 }

diff --git a/catalog/src/main/java/com/ning/billing/catalog/DefaultDuration.java b/catalog/src/main/java/com/ning/billing/catalog/DefaultDuration.java
index 34860be..87659e5 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/DefaultDuration.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/DefaultDuration.java
@@ -31,17 +31,17 @@ import com.ning.billing.util.config.ValidationErrors;
 
 @XmlAccessorType(XmlAccessType.NONE)
 public class DefaultDuration extends ValidatingConfig<StandaloneCatalog> implements Duration {
-	@XmlElement(required=true)
+    @XmlElement(required = true)
     private TimeUnit unit;
 
-	@XmlElement(required=false)
+    @XmlElement(required = false)
     private Integer number = -1;
-	
+
     /* (non-Javadoc)
-	 * @see com.ning.billing.catalog.IDuration#getUnit()
-	 */
+      * @see com.ning.billing.catalog.IDuration#getUnit()
+      */
     @Override
-	public TimeUnit getUnit() {
+    public TimeUnit getUnit() {
         return unit;
     }
 
@@ -49,13 +49,15 @@ public class DefaultDuration extends ValidatingConfig<StandaloneCatalog> impleme
 	 * @see com.ning.billing.catalog.IDuration#getLength()
 	 */
     @Override
-	public int getNumber() {
+    public int getNumber() {
         return number;
     }
 
     @Override
-    public DateTime addToDateTime(DateTime dateTime) {
-        if ((number == null) && (unit != TimeUnit.UNLIMITED)) {return dateTime;}
+    public DateTime addToDateTime(final DateTime dateTime) {
+        if ((number == null) && (unit != TimeUnit.UNLIMITED)) {
+            return dateTime;
+        }
 
         switch (unit) {
             case DAYS:
@@ -72,30 +74,32 @@ public class DefaultDuration extends ValidatingConfig<StandaloneCatalog> impleme
     }
 
     @Override
-	public ValidationErrors validate(StandaloneCatalog catalog, ValidationErrors errors) {
+    public ValidationErrors validate(final StandaloneCatalog catalog, final ValidationErrors errors) {
         //Validation: TimeUnit UNLIMITED iff number == -1
-        if((unit == TimeUnit.UNLIMITED && number != -1)) {
-            errors.add(new ValidationError("Duration can only have 'UNLIMITED' unit if the number is omitted.", 
-                    catalog.getCatalogURI(), DefaultPlanPhase.class, ""));
+        if ((unit == TimeUnit.UNLIMITED && number != -1)) {
+            errors.add(new ValidationError("Duration can only have 'UNLIMITED' unit if the number is omitted.",
+                                           catalog.getCatalogURI(), DefaultPlanPhase.class, ""));
         }
 
-		//TODO MDW - Validation TimeUnit UNLIMITED iff number == -1
-		return errors;
-	}
+        //TODO MDW - Validation TimeUnit UNLIMITED iff number == -1
+        return errors;
+    }
+
+    protected DefaultDuration setUnit(final TimeUnit unit) {
+        this.unit = unit;
+        return this;
+    }
 
-	protected DefaultDuration setUnit(TimeUnit unit) {
-		this.unit = unit;
-		return this;
-	}
+    protected DefaultDuration setNumber(final Integer number) {
+        this.number = number;
+        return this;
+    }
 
-	protected DefaultDuration setNumber(Integer number) {
-		this.number = number;
-		return this;
-	}
-	
     @Override
     public Period toJodaPeriod() {
-        if ((number == null) && (unit != TimeUnit.UNLIMITED)) {return new Period();}
+        if ((number == null) && (unit != TimeUnit.UNLIMITED)) {
+            return new Period();
+        }
 
         switch (unit) {
             case DAYS:

diff --git a/catalog/src/main/java/com/ning/billing/catalog/DefaultInternationalPrice.java b/catalog/src/main/java/com/ning/billing/catalog/DefaultInternationalPrice.java
index d0cf2c4..7411935 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/DefaultInternationalPrice.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/DefaultInternationalPrice.java
@@ -16,12 +16,11 @@
 
 package com.ning.billing.catalog;
 
-import java.math.BigDecimal;
-import java.net.URI;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
+import java.math.BigDecimal;
+import java.net.URI;
 
 import com.ning.billing.ErrorCode;
 import com.ning.billing.catalog.api.CatalogApiException;
@@ -35,102 +34,101 @@ import com.ning.billing.util.config.ValidationErrors;
 @XmlAccessorType(XmlAccessType.NONE)
 public class DefaultInternationalPrice extends ValidatingConfig<StandaloneCatalog> implements InternationalPrice {
 
-	//TODO: Must have a price point for every configured currency
-	//TODO: No prices is a zero cost plan
-	@XmlElement(name="price")
-	private DefaultPrice[] prices;
-
-
-	/* (non-Javadoc)
-	 * @see com.ning.billing.catalog.InternationalPrice#getPrices()
-	 */
-	@Override
-	public Price[] getPrices() {
-		return prices;
-	}
-
-
-
-	/* (non-Javadoc)
-	 * @see com.ning.billing.catalog.IInternationalPrice#getPrice(com.ning.billing.catalog.api.Currency)
-	 */
-	@Override 
-	public BigDecimal getPrice(Currency currency) throws CatalogApiException {
-		for(Price p : prices) {
-			if(p.getCurrency() == currency) {
-				return p.getValue();
-			}
-		}
-		throw new CatalogApiException(ErrorCode.CAT_NO_PRICE_FOR_CURRENCY, currency);
-	}
-
-	protected DefaultInternationalPrice setPrices(DefaultPrice[] prices) {
-		this.prices = prices;
-		return this;
-	}
-
-
-	@Override
-	public ValidationErrors validate(StandaloneCatalog catalog, ValidationErrors errors)  {
-		Currency[] supportedCurrencies = catalog.getCurrentSupportedCurrencies();
-		for (Price p : prices) {
-			Currency currency = p.getCurrency();
-			if(!currencyIsSupported(currency, supportedCurrencies)) {
-				errors.add("Unsupported currency: " + currency, catalog.getCatalogURI(), this.getClass(), "");
-			}
-			try {
-				if(p.getValue().doubleValue() < 0.0) {
-					errors.add("Negative value for price in currency: " + currency, catalog.getCatalogURI(), this.getClass(), "");
-				}
-			} catch (CurrencyValueNull e) {
-				// No currency => nothing to check, ignore exception
-			}
-		}
-		return errors;
-	}
-	
-	private boolean currencyIsSupported(Currency currency, Currency[] supportedCurrencies) {
-		for (Currency c : supportedCurrencies) {
-			if(c == currency) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-
-	@Override
-	public void initialize(StandaloneCatalog root, URI uri) {
-		if(prices == null) {
-			prices = getZeroPrice(root);
-		}
-		super.initialize(root, uri);
-	}
-
-	private synchronized DefaultPrice[] getZeroPrice(StandaloneCatalog root) {
-		Currency[] currencies = root.getCurrentSupportedCurrencies();
-		DefaultPrice[] zeroPrice = new DefaultPrice[currencies.length];
-		for(int i = 0; i < currencies.length; i++) {
-			zeroPrice[i] = new DefaultPrice();
-			zeroPrice[i].setCurrency(currencies[i]);
-			zeroPrice[i].setValue(new BigDecimal(0));
-		}
-
-		return zeroPrice;
-	}
-
-	@Override
-	public boolean isZero() {
-		for(DefaultPrice price :prices) {
-			try {
-				if( price.getValue().compareTo(BigDecimal.ZERO) != 0) {
-					return false;
-				}
-			} catch (CurrencyValueNull e) {
-				//Ignore if the currency is null we treat it as 0
-			}
-		}
-		return true;
-	}
+    //TODO: Must have a price point for every configured currency
+    //TODO: No prices is a zero cost plan
+    @XmlElement(name = "price")
+    private DefaultPrice[] prices;
+
+
+    /* (non-Javadoc)
+      * @see com.ning.billing.catalog.InternationalPrice#getPrices()
+      */
+    @Override
+    public Price[] getPrices() {
+        return prices;
+    }
+
+
+    /* (non-Javadoc)
+      * @see com.ning.billing.catalog.IInternationalPrice#getPrice(com.ning.billing.catalog.api.Currency)
+      */
+    @Override
+    public BigDecimal getPrice(final Currency currency) throws CatalogApiException {
+        for (final Price p : prices) {
+            if (p.getCurrency() == currency) {
+                return p.getValue();
+            }
+        }
+        throw new CatalogApiException(ErrorCode.CAT_NO_PRICE_FOR_CURRENCY, currency);
+    }
+
+    protected DefaultInternationalPrice setPrices(final DefaultPrice[] prices) {
+        this.prices = prices;
+        return this;
+    }
+
+
+    @Override
+    public ValidationErrors validate(final StandaloneCatalog catalog, final ValidationErrors errors) {
+        final Currency[] supportedCurrencies = catalog.getCurrentSupportedCurrencies();
+        for (final Price p : prices) {
+            final Currency currency = p.getCurrency();
+            if (!currencyIsSupported(currency, supportedCurrencies)) {
+                errors.add("Unsupported currency: " + currency, catalog.getCatalogURI(), this.getClass(), "");
+            }
+            try {
+                if (p.getValue().doubleValue() < 0.0) {
+                    errors.add("Negative value for price in currency: " + currency, catalog.getCatalogURI(), this.getClass(), "");
+                }
+            } catch (CurrencyValueNull e) {
+                // No currency => nothing to check, ignore exception
+            }
+        }
+        return errors;
+    }
+
+    private boolean currencyIsSupported(final Currency currency, final Currency[] supportedCurrencies) {
+        for (final Currency c : supportedCurrencies) {
+            if (c == currency) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+    @Override
+    public void initialize(final StandaloneCatalog root, final URI uri) {
+        if (prices == null) {
+            prices = getZeroPrice(root);
+        }
+        super.initialize(root, uri);
+    }
+
+    private synchronized DefaultPrice[] getZeroPrice(final StandaloneCatalog root) {
+        final Currency[] currencies = root.getCurrentSupportedCurrencies();
+        final DefaultPrice[] zeroPrice = new DefaultPrice[currencies.length];
+        for (int i = 0; i < currencies.length; i++) {
+            zeroPrice[i] = new DefaultPrice();
+            zeroPrice[i].setCurrency(currencies[i]);
+            zeroPrice[i].setValue(new BigDecimal(0));
+        }
+
+        return zeroPrice;
+    }
+
+    @Override
+    public boolean isZero() {
+        for (final DefaultPrice price : prices) {
+            try {
+                if (price.getValue().compareTo(BigDecimal.ZERO) != 0) {
+                    return false;
+                }
+            } catch (CurrencyValueNull e) {
+                //Ignore if the currency is null we treat it as 0
+            }
+        }
+        return true;
+    }
 
 }

diff --git a/catalog/src/main/java/com/ning/billing/catalog/DefaultListing.java b/catalog/src/main/java/com/ning/billing/catalog/DefaultListing.java
index bede9f0..70c6761 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/DefaultListing.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/DefaultListing.java
@@ -24,7 +24,7 @@ public class DefaultListing implements Listing {
     private final Plan plan;
     private final PriceList priceList;
 
-    public DefaultListing(Plan plan, PriceList priceList) {
+    public DefaultListing(final Plan plan, final PriceList priceList) {
         super();
         this.plan = plan;
         this.priceList = priceList;

diff --git a/catalog/src/main/java/com/ning/billing/catalog/DefaultPlan.java b/catalog/src/main/java/com/ning/billing/catalog/DefaultPlan.java
index a249289..fcf35b5 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/DefaultPlan.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/DefaultPlan.java
@@ -18,6 +18,7 @@ package com.ning.billing.catalog;
 
 import java.net.URI;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.Iterator;
 
@@ -34,7 +35,6 @@ import org.joda.time.DateTime;
 import com.ning.billing.ErrorCode;
 import com.ning.billing.catalog.api.BillingPeriod;
 import com.ning.billing.catalog.api.CatalogApiException;
-import com.ning.billing.catalog.api.PhaseType;
 import com.ning.billing.catalog.api.Plan;
 import com.ning.billing.catalog.api.PlanPhase;
 import com.ning.billing.catalog.api.Product;
@@ -45,46 +45,47 @@ import com.ning.billing.util.config.ValidationErrors;
 @XmlAccessorType(XmlAccessType.NONE)
 public class DefaultPlan extends ValidatingConfig<StandaloneCatalog> implements Plan {
 
-	@XmlAttribute(required=true)
-	@XmlID
-	private String name;
-	
-	@XmlAttribute(required=false)
-	private Boolean retired = false;
-	
-	//TODO MDW Validation - effectiveDateForExistingSubscriptons > catalog effectiveDate 
-	@XmlElement(required=false)
-	private Date effectiveDateForExistingSubscriptons;
-
-	@XmlElement(required=true)
-	@XmlIDREF
+    @XmlAttribute(required = true)
+    @XmlID
+    private String name;
+
+    @XmlAttribute(required = false)
+    private Boolean retired = false;
+
+    //TODO MDW Validation - effectiveDateForExistingSubscriptons > catalog effectiveDate
+    @XmlElement(required = false)
+    private Date effectiveDateForExistingSubscriptons;
+
+    @XmlElement(required = true)
+    @XmlIDREF
     private DefaultProduct product;
 
-	@XmlElementWrapper(name="initialPhases", required=false)
-	@XmlElement(name="phase", required=true)
+    @XmlElementWrapper(name = "initialPhases", required = false)
+    @XmlElement(name = "phase", required = true)
     private DefaultPlanPhase[] initialPhases = new DefaultPlanPhase[0];
 
-	@XmlElement(name="finalPhase", required=true)
+    @XmlElement(name = "finalPhase", required = true)
     private DefaultPlanPhase finalPhase;
 
-	//If this is missing it defaults to 1
-	//No other value is allowed for BASE plans.
-	//No other value is allowed for Tiered ADDONS
-	//A value of -1 means unlimited
-	@XmlElement(required=false)
-	private Integer plansAllowedInBundle = 1;
+    //If this is missing it defaults to 1
+    //No other value is allowed for BASE plans.
+    //No other value is allowed for Tiered ADDONS
+    //A value of -1 means unlimited
+    @XmlElement(required = false)
+    private Integer plansAllowedInBundle = 1;
 
-	/* (non-Javadoc)
-	 * @see com.ning.billing.catalog.IPlan#getEffectiveDateForExistingSubscriptons()
-	 */
-	@Override
-	public Date getEffectiveDateForExistingSubscriptons() {
-		return effectiveDateForExistingSubscriptons;
-	}	/* (non-Javadoc)
+    /* (non-Javadoc)
+      * @see com.ning.billing.catalog.IPlan#getEffectiveDateForExistingSubscriptons()
+      */
+    @Override
+    public Date getEffectiveDateForExistingSubscriptons() {
+        return effectiveDateForExistingSubscriptons;
+    }    /* (non-Javadoc)
 	 * @see com.ning.billing.catalog.IPlan#getPhases()
 	 */
+
     @Override
-	public DefaultPlanPhase[] getInitialPhases() {
+    public DefaultPlanPhase[] getInitialPhases() {
         return initialPhases;
     }
 
@@ -92,157 +93,166 @@ public class DefaultPlan extends ValidatingConfig<StandaloneCatalog> implements 
 	 * @see com.ning.billing.catalog.IPlan#getProduct()
 	 */
     @Override
-	public Product getProduct() {
+    public Product getProduct() {
         return product;
     }
 
-	/* (non-Javadoc)
-	 * @see com.ning.billing.catalog.IPlan#getName()
-	 */
-	@Override
-	public String getName() {
-		return name;
-	}
-	
-	@Override
-	public boolean isRetired() {
-		return retired;
-	}
-	
-	@Override
-	public DefaultPlanPhase getFinalPhase() {
-		return finalPhase;
-	}
+    /* (non-Javadoc)
+      * @see com.ning.billing.catalog.IPlan#getName()
+      */
+    @Override
+    public String getName() {
+        return name;
+    }
 
-	@Override
-	public PlanPhase[] getAllPhases() {
-	    int length = (initialPhases == null || initialPhases.length == 0) ? 1 : (initialPhases.length + 1);
-	    PlanPhase[] allPhases = new DefaultPlanPhase[length];
+    @Override
+    public boolean isRetired() {
+        return retired;
+    }
+
+    @Override
+    public DefaultPlanPhase getFinalPhase() {
+        return finalPhase;
+    }
+
+    @Override
+    public PlanPhase[] getAllPhases() {
+        final int length = (initialPhases == null || initialPhases.length == 0) ? 1 : (initialPhases.length + 1);
+        final PlanPhase[] allPhases = new DefaultPlanPhase[length];
         int cnt = 0;
-	    if (length > 1) {
-	        for (PlanPhase cur : initialPhases) {
-	            allPhases[cnt++] = cur;
-	        }
-	    }
+        if (length > 1) {
+            for (final PlanPhase cur : initialPhases) {
+                allPhases[cnt++] = cur;
+            }
+        }
         allPhases[cnt++] = finalPhase;
-	    return allPhases;
-	}
+        return allPhases;
+    }
 
-	@Override
-	public PlanPhase findPhase(String name) throws CatalogApiException {
-		for(PlanPhase pp : getAllPhases()) {
-			if(pp.getName().equals(name)) {
-				return pp;
-			}
+    @Override
+    public PlanPhase findPhase(final String name) throws CatalogApiException {
+        for (final PlanPhase pp : getAllPhases()) {
+            if (pp.getName().equals(name)) {
+                return pp;
+            }
 
-		}
-		throw new CatalogApiException(ErrorCode.CAT_NO_SUCH_PHASE, name);
-	}
+        }
+        throw new CatalogApiException(ErrorCode.CAT_NO_SUCH_PHASE, name);
+    }
 
-	@Override
-	public BillingPeriod getBillingPeriod(){
-		return finalPhase.getBillingPeriod();
-	}
+    @Override
+    public BillingPeriod getBillingPeriod() {
+        return finalPhase.getBillingPeriod();
+    }
 
-	/* (non-Javadoc)
-	 * @see com.ning.billing.catalog.IPlan#getPlansAllowedInBundle()
-	 */
-	@Override
-	public int getPlansAllowedInBundle() {
-		return plansAllowedInBundle;
-	}
+    /* (non-Javadoc)
+      * @see com.ning.billing.catalog.IPlan#getPlansAllowedInBundle()
+      */
+    @Override
+    public int getPlansAllowedInBundle() {
+        return plansAllowedInBundle;
+    }
+
+    /* (non-Javadoc)
+      * @see com.ning.billing.catalog.IPlan#getPhaseIterator()
+      */
+    @Override
+    public Iterator<PlanPhase> getInitialPhaseIterator() {
+        final ArrayList<PlanPhase> list = new ArrayList<PlanPhase>();
+        for (final DefaultPlanPhase p : initialPhases) {
+            list.add(p);
+        }
+        return list.iterator();
+    }
+
+    @Override
+    public void initialize(final StandaloneCatalog catalog, final URI sourceURI) {
+        super.initialize(catalog, sourceURI);
+        if (finalPhase != null) {
+            finalPhase.setPlan(this);
+            finalPhase.initialize(catalog, sourceURI);
+        }
+        if (initialPhases != null) {
+            for (final DefaultPlanPhase p : initialPhases) {
+                p.setPlan(this);
+                p.initialize(catalog, sourceURI);
+            }
+        }
+    }
+
+    @Override
+    public ValidationErrors validate(final StandaloneCatalog catalog, final ValidationErrors errors) {
+        if (effectiveDateForExistingSubscriptons != null &&
+                catalog.getEffectiveDate().getTime() > effectiveDateForExistingSubscriptons.getTime()) {
+            errors.add(new ValidationError(String.format("Price effective date %s is before catalog effective date '%s'",
+                                                         effectiveDateForExistingSubscriptons,
+                                                         catalog.getEffectiveDate().getTime()),
+                                           catalog.getCatalogURI(), DefaultInternationalPrice.class, ""));
+        }
+
+        return errors;
+    }
+
+    protected void setEffectiveDateForExistingSubscriptons(
+            final Date effectiveDateForExistingSubscriptons) {
+        this.effectiveDateForExistingSubscriptons = effectiveDateForExistingSubscriptons;
+    }
+
+    protected DefaultPlan setName(final String name) {
+        this.name = name;
+        return this;
+    }
+
+    protected DefaultPlan setPlansAllowedInBundle(final int plansAllowedInBundle) {
+        this.plansAllowedInBundle = plansAllowedInBundle;
+        return this;
+    }
+
+    protected DefaultPlan setFinalPhase(final DefaultPlanPhase finalPhase) {
+        this.finalPhase = finalPhase;
+        return this;
+    }
+
+    protected DefaultPlan setProduct(final DefaultProduct product) {
+        this.product = product;
+        return this;
+    }
+
+    protected DefaultPlan setInitialPhases(final DefaultPlanPhase[] phases) {
+        this.initialPhases = phases;
+        return this;
+    }
+
+    public DefaultPlan setRetired(final boolean retired) {
+        this.retired = retired;
+        return this;
+    }
+
+    public DefaultPlan setPlansAllowedInBundle(final Integer plansAllowedInBundle) {
+        this.plansAllowedInBundle = plansAllowedInBundle;
+        return this;
+    }
+
+    @Override
+    public DateTime dateOfFirstRecurringNonZeroCharge(final DateTime subscriptionStartDate) {
+        DateTime result = subscriptionStartDate.toDateTime();
+        for (final PlanPhase phase : getAllPhases()) {
+            if (phase.getRecurringPrice() == null || phase.getRecurringPrice().isZero()) {
+                result = phase.getDuration().addToDateTime(result);
+            } else {
+                break;
+            }
+        }
+        return result;
+    }
 
-	/* (non-Javadoc)
-	 * @see com.ning.billing.catalog.IPlan#getPhaseIterator()
-	 */
-	@Override
-	public Iterator<PlanPhase> getInitialPhaseIterator() {
-		ArrayList<PlanPhase> list = new ArrayList<PlanPhase>();
-		for(DefaultPlanPhase p : initialPhases) {
-			list.add(p);
-		}
-		return list.iterator();
-	}
 
-	@Override
-	public void initialize(StandaloneCatalog catalog, URI sourceURI) {
-		super.initialize(catalog, sourceURI);
-		if(finalPhase != null) {
-			finalPhase.setPlan(this);
-			finalPhase.initialize(catalog, sourceURI);
-		}
-		if(initialPhases != null) {
-			for(DefaultPlanPhase p : initialPhases) {
-				p.setPlan(this);
-				p.initialize(catalog, sourceURI);
-			}
-		}
-	}
 
 	@Override
-	public ValidationErrors validate(StandaloneCatalog catalog, ValidationErrors errors) {
-		if(effectiveDateForExistingSubscriptons != null &&
-				catalog.getEffectiveDate().getTime() > effectiveDateForExistingSubscriptons.getTime()) {
-			errors.add(new ValidationError(String.format("Price effective date %s is before catalog effective date '%s'",
-					effectiveDateForExistingSubscriptons,
-					catalog.getEffectiveDate().getTime()), 
-					catalog.getCatalogURI(), DefaultInternationalPrice.class, ""));
-		}
-		
-		return errors;
-	}
-
-	protected void setEffectiveDateForExistingSubscriptons(
-			Date effectiveDateForExistingSubscriptons) {
-		this.effectiveDateForExistingSubscriptons = effectiveDateForExistingSubscriptons;
-	}
-
-	protected DefaultPlan setName(String name) {
-		this.name = name;
-		return this;
-	}
-
-	protected DefaultPlan setPlansAllowedInBundle(int plansAllowedInBundle) {
-		this.plansAllowedInBundle = plansAllowedInBundle;
-		return this;
-	}
-
-	protected DefaultPlan setFinalPhase(DefaultPlanPhase finalPhase) {
-		this.finalPhase = finalPhase;
-		return this;
-	}
-
-	protected DefaultPlan setProduct(DefaultProduct product) {
-		this.product = product;
-		return this;
-	}
-
-	protected DefaultPlan setInitialPhases(DefaultPlanPhase[] phases) {
-		this.initialPhases = phases;
-		return this;
-	}
-
-	public DefaultPlan setRetired(boolean retired) {
-		this.retired = retired;
-		return this;
-	}
-	
-	public DefaultPlan setPlansAllowedInBundle(Integer plansAllowedInBundle) {
-		this.plansAllowedInBundle = plansAllowedInBundle;
-		return this;
-	}
-	@Override
-	public DateTime dateOfFirstRecurringNonZeroCharge(DateTime subscriptionStartDate) {
-		DateTime result = subscriptionStartDate.toDateTime();
-		for (PlanPhase phase : getAllPhases()) {
-			if(phase.getRecurringPrice() == null || phase.getRecurringPrice().isZero()) {
-				result = phase.getDuration().addToDateTime(result);
-			} else {
-				break;
-			}
-		}
-		return result;
-	}
-	
-	
+    public String toString() {
+        return "DefaultPlan [name=" + name + ", retired=" + retired + ", effectiveDateForExistingSubscriptons="
+                + effectiveDateForExistingSubscriptons + ", product=" + product + ", initialPhases="
+                + Arrays.toString(initialPhases) + ", finalPhase=" + finalPhase + ", plansAllowedInBundle="
+                + plansAllowedInBundle + "]";
+    }
 }

diff --git a/catalog/src/main/java/com/ning/billing/catalog/DefaultPlanPhase.java b/catalog/src/main/java/com/ning/billing/catalog/DefaultPlanPhase.java
index 8feff37..3bb0cb1 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/DefaultPlanPhase.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/DefaultPlanPhase.java
@@ -16,12 +16,11 @@
 
 package com.ning.billing.catalog;
 
-import java.net.URI;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
+import java.net.URI;
 
 import com.ning.billing.ErrorCode;
 import com.ning.billing.catalog.api.BillingPeriod;
@@ -38,174 +37,178 @@ import com.ning.billing.util.config.ValidationErrors;
 @XmlAccessorType(XmlAccessType.NONE)
 public class DefaultPlanPhase extends ValidatingConfig<StandaloneCatalog> implements PlanPhase {
 
-	@XmlAttribute (required=true)
-	private PhaseType type;
+    @XmlAttribute(required = true)
+    private PhaseType type;
 
-    @XmlElement(required=true)
+    @XmlElement(required = true)
     private DefaultDuration duration;
-    
-    @XmlElement(required=true)
+
+    @XmlElement(required = true)
     private BillingPeriod billingPeriod;
 
-	@XmlElement(required=false)
-	private DefaultInternationalPrice recurringPrice;
+    @XmlElement(required = false)
+    private DefaultInternationalPrice recurringPrice;
 
-	@XmlElement(required=false)
-	private DefaultInternationalPrice fixedPrice;
+    @XmlElement(required = false)
+    private DefaultInternationalPrice fixedPrice;
 
 //  Not supported: variable pricing
 //	@XmlElement(required=false)
 //	private InternationalPrice unitPrice;
 
-	//Not exposed in XML
-	private Plan plan;
-	
-	public static String phaseName(String planName, PhaseType phasetype) {
-		return planName + "-" + phasetype.toString().toLowerCase();
-	}
-	
-	public static String planName(String phaseName) throws CatalogApiException {
-		for(PhaseType type : PhaseType.values()) {
-			if(phaseName.endsWith(type.toString().toLowerCase())) {
-				return phaseName.substring(0, phaseName.length() - type.toString().length() - 1);
-			}
-		}
-		throw new CatalogApiException(ErrorCode.CAT_BAD_PHASE_NAME, phaseName);
-	}
-
-
-	/* (non-Javadoc)
-	 * @see com.ning.billing.catalog.IPlanPhase#getRecurringPrice()
-	 */
+    //Not exposed in XML
+    private Plan plan;
+
+    public static String phaseName(final String planName, final PhaseType phasetype) {
+        return planName + "-" + phasetype.toString().toLowerCase();
+    }
+
+    public static String planName(final String phaseName) throws CatalogApiException {
+        for (final PhaseType type : PhaseType.values()) {
+            if (phaseName.endsWith(type.toString().toLowerCase())) {
+                return phaseName.substring(0, phaseName.length() - type.toString().length() - 1);
+            }
+        }
+        throw new CatalogApiException(ErrorCode.CAT_BAD_PHASE_NAME, phaseName);
+    }
+
+
+    /* (non-Javadoc)
+      * @see com.ning.billing.catalog.IPlanPhase#getRecurringPrice()
+      */
     @Override
-	public DefaultInternationalPrice getRecurringPrice() {
+    public DefaultInternationalPrice getRecurringPrice() {
         return recurringPrice;
     }
 
-	/* (non-Javadoc)
-	 * @see com.ning.billing.catalog.IPlanPhase#getInternationalPrice()
-	 */
+    /* (non-Javadoc)
+      * @see com.ning.billing.catalog.IPlanPhase#getInternationalPrice()
+      */
     @Override
-	public InternationalPrice getFixedPrice() {
+    public InternationalPrice getFixedPrice() {
         return fixedPrice;
     }
 
-	/* (non-Javadoc)
-	 * @see com.ning.billing.catalog.IPlanPhase#getCohort()
-	 */
-	@Override
-	public PhaseType getPhaseType() {
-		return type;
-	}
+    /* (non-Javadoc)
+      * @see com.ning.billing.catalog.IPlanPhase#getCohort()
+      */
+    @Override
+    public PhaseType getPhaseType() {
+        return type;
+    }
+
+    /* (non-Javadoc)
+      * @see com.ning.billing.catalog.IPlanPhase#getBillCycleDuration()
+      */
+    @Override
+    public BillingPeriod getBillingPeriod() {
+        return billingPeriod;
+    }
 
-	/* (non-Javadoc)
-	 * @see com.ning.billing.catalog.IPlanPhase#getBillCycleDuration()
-	 */
+    /* (non-Javadoc)
+      * @see com.ning.billing.catalog.IPlanPhase#getName()
+      */
     @Override
-	public BillingPeriod getBillingPeriod() {
-    	return billingPeriod;
-    }
-
-	/* (non-Javadoc)
-	 * @see com.ning.billing.catalog.IPlanPhase#getName()
-	 */
-	@Override
-	public String getName() {
-		return phaseName(plan.getName(),this.getPhaseType());
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ning.billing.catalog.IPlanPhase#getPlan()
-	 */
-	@Override
-	public Plan getPlan() {
-		return plan;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ning.billing.catalog.IPlanPhase#getDuration()
-	 */
-	@Override
-	public Duration getDuration() {
- 		return duration;
-	}
-
-	@Override
-	public ValidationErrors validate(StandaloneCatalog catalog, ValidationErrors errors) {
-		//Validation: check for nulls
-		if(billingPeriod == null) {
-			errors.add(new ValidationError(String.format("Phase %s of plan %s has a recurring price but no billing period", type.toString(), plan.getName()),
-					catalog.getCatalogURI(), DefaultPlanPhase.class, type.toString()));
-		}
-	
-		//Validation: if there is a recurring price there must be a billing period
-		if((recurringPrice != null) && (billingPeriod == null || billingPeriod == BillingPeriod.NO_BILLING_PERIOD)) {
-			errors.add(new ValidationError(String.format("Phase %s of plan %s has a recurring price but no billing period", type.toString(), plan.getName()),
-					catalog.getCatalogURI(), DefaultPlanPhase.class, type.toString()));
-		}
+    public String getName() {
+        return phaseName(plan.getName(), this.getPhaseType());
+    }
+
+    /* (non-Javadoc)
+      * @see com.ning.billing.catalog.IPlanPhase#getPlan()
+      */
+    @Override
+    public Plan getPlan() {
+        return plan;
+    }
+
+    /* (non-Javadoc)
+      * @see com.ning.billing.catalog.IPlanPhase#getDuration()
+      */
+    @Override
+    public Duration getDuration() {
+        return duration;
+    }
+
+    @Override
+    public ValidationErrors validate(final StandaloneCatalog catalog, final ValidationErrors errors) {
+        //Validation: check for nulls
+        if (billingPeriod == null) {
+            errors.add(new ValidationError(String.format("Phase %s of plan %s has a recurring price but no billing period", type.toString(), plan.getName()),
+                                           catalog.getCatalogURI(), DefaultPlanPhase.class, type.toString()));
+        }
+
+        //Validation: if there is a recurring price there must be a billing period
+        if ((recurringPrice != null) && (billingPeriod == null || billingPeriod == BillingPeriod.NO_BILLING_PERIOD)) {
+            errors.add(new ValidationError(String.format("Phase %s of plan %s has a recurring price but no billing period", type.toString(), plan.getName()),
+                                           catalog.getCatalogURI(), DefaultPlanPhase.class, type.toString()));
+        }
 
         //Validation: if there is no recurring price there should be no billing period
-        if((recurringPrice == null) && billingPeriod != BillingPeriod.NO_BILLING_PERIOD) {
+        if ((recurringPrice == null) && billingPeriod != BillingPeriod.NO_BILLING_PERIOD) {
             errors.add(new ValidationError(String.format("Phase %s of plan %s has no recurring price but does have a billing period. The billing period should be set to '%s'",
-                    type.toString(), plan.getName(), BillingPeriod.NO_BILLING_PERIOD), 
-                    catalog.getCatalogURI(), DefaultPlanPhase.class, type.toString()));
+                                                         type.toString(), plan.getName(), BillingPeriod.NO_BILLING_PERIOD),
+                                           catalog.getCatalogURI(), DefaultPlanPhase.class, type.toString()));
         }
-        
+
         //Validation: if there BP is set to NO_BILLING_PERIOD there must be a fixed price
-        if((billingPeriod == BillingPeriod.NO_BILLING_PERIOD && fixedPrice == null)) {
+        if ((billingPeriod == BillingPeriod.NO_BILLING_PERIOD && fixedPrice == null)) {
             errors.add(new ValidationError(String.format("Phase %s of plan %s has no billing period. It must have a fixed price set.",
-                    type.toString(), plan.getName()), 
-                    catalog.getCatalogURI(), DefaultPlanPhase.class, type.toString()));
+                                                         type.toString(), plan.getName()),
+                                           catalog.getCatalogURI(), DefaultPlanPhase.class, type.toString()));
+        }
+
+        //Validation: there must be at least one of recurringPrice or fixedPrice
+        if ((recurringPrice == null) && fixedPrice == null) {
+            errors.add(new ValidationError(String.format("Phase %s of plan %s has neither a recurring price or a fixed price.",
+                                                         type.toString(), plan.getName()),
+                                           catalog.getCatalogURI(), DefaultPlanPhase.class, type.toString()));
         }
-        
-		//Validation: there must be at least one of recurringPrice or fixedPrice
-		if((recurringPrice == null) && fixedPrice == null) {
-			errors.add(new ValidationError(String.format("Phase %s of plan %s has neither a recurring price or a fixed price.",
-					type.toString(), plan.getName()), 
-					catalog.getCatalogURI(), DefaultPlanPhase.class, type.toString()));
-		}
         return errors;
-	}
-	
-	@Override
-	public void initialize(StandaloneCatalog root, URI uri) {
-		if (fixedPrice != null) { fixedPrice.initialize(root, uri);  }	
-		if (recurringPrice != null) { recurringPrice.initialize(root, uri); }
-	}
-	
-	protected DefaultPlanPhase setFixedPrice(DefaultInternationalPrice price) {
-		this.fixedPrice = price;
-		return this;
-	}
-
-	protected DefaultPlanPhase setRecurringPrice(DefaultInternationalPrice price) {
-		this.recurringPrice = price;
-		return this;
-	}
-
-	protected DefaultPlanPhase setPhaseType(PhaseType cohort) {
-		this.type = cohort;
-		return this;
-	}
-
-	protected DefaultPlanPhase setBillingPeriod(BillingPeriod billingPeriod) {
-		this.billingPeriod = billingPeriod;
-		return this;
-	}
-
-	protected DefaultPlanPhase setDuration(DefaultDuration duration) {
-		this.duration = duration;
-		return this;
-	}
-
-	protected DefaultPlanPhase setPlan(Plan plan) {
-		this.plan = plan;
-		return this;
-	}
-	
-	protected DefaultPlanPhase setBillCycleDuration(BillingPeriod billingPeriod) {
-		this.billingPeriod = billingPeriod;
-		return this;
-	}
+    }
+
+    @Override
+    public void initialize(final StandaloneCatalog root, final URI uri) {
+        if (fixedPrice != null) {
+            fixedPrice.initialize(root, uri);
+        }
+        if (recurringPrice != null) {
+            recurringPrice.initialize(root, uri);
+        }
+    }
+
+    protected DefaultPlanPhase setFixedPrice(final DefaultInternationalPrice price) {
+        this.fixedPrice = price;
+        return this;
+    }
+
+    protected DefaultPlanPhase setRecurringPrice(final DefaultInternationalPrice price) {
+        this.recurringPrice = price;
+        return this;
+    }
+
+    protected DefaultPlanPhase setPhaseType(final PhaseType cohort) {
+        this.type = cohort;
+        return this;
+    }
+
+    protected DefaultPlanPhase setBillingPeriod(final BillingPeriod billingPeriod) {
+        this.billingPeriod = billingPeriod;
+        return this;
+    }
+
+    protected DefaultPlanPhase setDuration(final DefaultDuration duration) {
+        this.duration = duration;
+        return this;
+    }
+
+    protected DefaultPlanPhase setPlan(final Plan plan) {
+        this.plan = plan;
+        return this;
+    }
+
+    protected DefaultPlanPhase setBillCycleDuration(final BillingPeriod billingPeriod) {
+        this.billingPeriod = billingPeriod;
+        return this;
+    }
 
 }

diff --git a/catalog/src/main/java/com/ning/billing/catalog/DefaultPrice.java b/catalog/src/main/java/com/ning/billing/catalog/DefaultPrice.java
index 9b5f00b..d07bc37 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/DefaultPrice.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/DefaultPrice.java
@@ -16,24 +16,24 @@
 
 package com.ning.billing.catalog;
 
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import java.math.BigDecimal;
+
 import com.ning.billing.catalog.api.Currency;
 import com.ning.billing.catalog.api.CurrencyValueNull;
 import com.ning.billing.catalog.api.Price;
 import com.ning.billing.util.config.ValidatingConfig;
 import com.ning.billing.util.config.ValidationErrors;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import java.math.BigDecimal;
-
 @XmlAccessorType(XmlAccessType.NONE)
 public class DefaultPrice extends ValidatingConfig<StandaloneCatalog> implements Price {
-	@XmlElement(required=true)
-	private Currency currency;
+    @XmlElement(required = true)
+    private Currency currency;
 
-	@XmlElement(required=true,nillable=true)
-	private BigDecimal value;
+    @XmlElement(required = true, nillable = true)
+    private BigDecimal value;
 
     public DefaultPrice() {
         // for serialization support
@@ -45,38 +45,38 @@ public class DefaultPrice extends ValidatingConfig<StandaloneCatalog> implements
         this.currency = currency;
     }
 
-	/* (non-Javadoc)
-	 * @see com.ning.billing.catalog.IPrice#getCurrency()
-	 */
-	@Override
-	public Currency getCurrency() {
-		return currency;
-	}
+    /* (non-Javadoc)
+      * @see com.ning.billing.catalog.IPrice#getCurrency()
+      */
+    @Override
+    public Currency getCurrency() {
+        return currency;
+    }
 
-	/* (non-Javadoc)
-	 * @see com.ning.billing.catalog.IPrice#getValue()
-	 */
-	@Override
-	public BigDecimal getValue() throws CurrencyValueNull {
-		if (value == null) {
-			throw new CurrencyValueNull(currency);
-		}
-		return value;
-	}
-	
-	protected DefaultPrice setCurrency(Currency currency) {
-		this.currency = currency;
-		return this;
-	}
+    /* (non-Javadoc)
+      * @see com.ning.billing.catalog.IPrice#getValue()
+      */
+    @Override
+    public BigDecimal getValue() throws CurrencyValueNull {
+        if (value == null) {
+            throw new CurrencyValueNull(currency);
+        }
+        return value;
+    }
 
-	protected DefaultPrice setValue(BigDecimal value) {
-		this.value = value;
-		return this;
-	}
-	
-	@Override
-	public ValidationErrors validate(StandaloneCatalog catalog, ValidationErrors errors) {
-		return errors;
+    protected DefaultPrice setCurrency(final Currency currency) {
+        this.currency = currency;
+        return this;
+    }
 
-	}
+    protected DefaultPrice setValue(final BigDecimal value) {
+        this.value = value;
+        return this;
+    }
+
+    @Override
+    public ValidationErrors validate(final StandaloneCatalog catalog, final ValidationErrors errors) {
+        return errors;
+
+    }
 }

diff --git a/catalog/src/main/java/com/ning/billing/catalog/DefaultPriceList.java b/catalog/src/main/java/com/ning/billing/catalog/DefaultPriceList.java
index c597dc0..9c9ce54 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/DefaultPriceList.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/DefaultPriceList.java
@@ -16,13 +16,6 @@
 
 package com.ning.billing.catalog;
 
-import com.ning.billing.catalog.api.BillingPeriod;
-import com.ning.billing.catalog.api.PriceList;
-import com.ning.billing.catalog.api.Product;
-import com.ning.billing.util.config.ValidatingConfig;
-import com.ning.billing.util.config.ValidationError;
-import com.ning.billing.util.config.ValidationErrors;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
@@ -31,96 +24,105 @@ import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlID;
 import javax.xml.bind.annotation.XmlIDREF;
 
+import com.ning.billing.catalog.api.BillingPeriod;
+import com.ning.billing.catalog.api.PriceList;
+import com.ning.billing.catalog.api.Product;
+import com.ning.billing.util.config.ValidatingConfig;
+import com.ning.billing.util.config.ValidationError;
+import com.ning.billing.util.config.ValidationErrors;
+
 @XmlAccessorType(XmlAccessType.NONE)
-public class DefaultPriceList extends ValidatingConfig<StandaloneCatalog> implements PriceList  {
+public class DefaultPriceList extends ValidatingConfig<StandaloneCatalog> implements PriceList {
+
+    @XmlAttribute(required = true)
+    @XmlID
+    private String name;
 
-	@XmlAttribute(required=true)
-	@XmlID
-	private String name;
+    @XmlAttribute(required = false)
+    private Boolean retired = false;
 
-	@XmlAttribute(required=false)
-	private Boolean retired = false;
-	
-	@XmlElementWrapper(name="plans", required=true)
-	@XmlIDREF @XmlElement(name="plan", required=true)
+    @XmlElementWrapper(name = "plans", required = true)
+    @XmlIDREF
+    @XmlElement(name = "plan", required = true)
     private DefaultPlan[] plans;
-	
-	public DefaultPriceList(){}
-
-	public DefaultPriceList(DefaultPlan[] plans, String name) {
-		this.plans = plans;
-		this.name = name;
-	}
-
-	protected DefaultPlan[] getPlans() {
-		return plans;
-	}
-
-	public boolean isRetired() {
-		return retired;
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ning.billing.catalog.IPriceList#getName()
-	 */
-	@Override
-	public String getName() {
+
+    public DefaultPriceList() {
+    }
+
+    public DefaultPriceList(final DefaultPlan[] plans, final String name) {
+        this.plans = plans;
+        this.name = name;
+    }
+
+    protected DefaultPlan[] getPlans() {
+        return plans;
+    }
+
+    public boolean isRetired() {
+        return retired;
+    }
+
+    /* (non-Javadoc)
+      * @see com.ning.billing.catalog.IPriceList#getName()
+      */
+    @Override
+    public String getName() {
         return name;
     }
 
-	/* (non-Javadoc)
-	 * @see com.ning.billing.catalog.IPriceList#findPlan(com.ning.billing.catalog.api.IProduct, com.ning.billing.catalog.api.BillingPeriod)
-	 */
-	@Override
-	public DefaultPlan findPlan(Product product, BillingPeriod period) {
-        for (DefaultPlan cur : getPlans()) {
-            if (cur.getProduct().equals(product) && 
-            		(cur.getBillingPeriod() == null || cur.getBillingPeriod().equals(period))) {
+    /* (non-Javadoc)
+      * @see com.ning.billing.catalog.IPriceList#findPlan(com.ning.billing.catalog.api.IProduct, com.ning.billing.catalog.api.BillingPeriod)
+      */
+    @Override
+    public DefaultPlan findPlan(final Product product, final BillingPeriod period) {
+        for (final DefaultPlan cur : getPlans()) {
+            if (cur.getProduct().equals(product) &&
+                    (cur.getBillingPeriod() == null || cur.getBillingPeriod().equals(period))) {
                 return cur;
             }
         }
         return null;
     }
 
-	@Override
-	public ValidationErrors validate(StandaloneCatalog catalog, ValidationErrors errors) {
-		 for (DefaultPlan cur : getPlans()) {
-			 int numPlans = findNumberOfPlans(cur.getProduct(), cur.getBillingPeriod());
-			 if ( numPlans > 1 ) {
-				 errors.add(new ValidationError(
-						 String.format("There are %d plans in pricelist %s and have the same product/billingPeriod (%s, %s)", 
-								 numPlans, getName(), cur.getProduct().getName(), cur.getBillingPeriod()), catalog.getCatalogURI(),
-								 DefaultPriceListSet.class, getName()));
-			 }
-		 }
-		return errors;
-	}
-	
-	private int findNumberOfPlans(Product product, BillingPeriod period) {
-		int count = 0;
-        for (DefaultPlan cur : getPlans()) {
-            if (cur.getProduct().equals(product) && 
-            		(cur.getBillingPeriod() == null || cur.getBillingPeriod().equals(period))) {
+    @Override
+    public ValidationErrors validate(final StandaloneCatalog catalog, final ValidationErrors errors) {
+        for (final DefaultPlan cur : getPlans()) {
+            final int numPlans = findNumberOfPlans(cur.getProduct(), cur.getBillingPeriod());
+            if (numPlans > 1) {
+                errors.add(new ValidationError(
+                        String.format("There are %d plans in pricelist %s and have the same product/billingPeriod (%s, %s)",
+                                      numPlans, getName(), cur.getProduct().getName(), cur.getBillingPeriod()), catalog.getCatalogURI(),
+                        DefaultPriceListSet.class, getName()));
+            }
+        }
+        return errors;
+    }
+
+    private int findNumberOfPlans(final Product product, final BillingPeriod period) {
+        int count = 0;
+        for (final DefaultPlan cur : getPlans()) {
+            if (cur.getProduct().equals(product) &&
+                    (cur.getBillingPeriod() == null || cur.getBillingPeriod().equals(period))) {
                 count++;
             }
         }
         return count;
     }
-	
-	protected DefaultPriceList setRetired(boolean retired) {
-		this.retired = retired;
-		return this;
-	}
-
-	public DefaultPriceList setName(String name) {
-		this.name = name;
-		return this;
-	}
-
-	public DefaultPriceList setPlans(DefaultPlan[] plans) {
-		this.plans = plans;
-		return this;
-	}
+
+    protected DefaultPriceList setRetired(final boolean retired) {
+        this.retired = retired;
+        return this;
+    }
+
+    public DefaultPriceList setName(final String name) {
+        this.name = name;
+        return this;
+    }
+
+    public DefaultPriceList setPlans(final DefaultPlan[] plans) {
+        this.plans = plans;
+        return this;
+    }
 
 
 }

diff --git a/catalog/src/main/java/com/ning/billing/catalog/DefaultPriceListSet.java b/catalog/src/main/java/com/ning/billing/catalog/DefaultPriceListSet.java
index b8a8695..a47abb8 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/DefaultPriceListSet.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/DefaultPriceListSet.java
@@ -16,12 +16,11 @@
 
 package com.ning.billing.catalog;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
+import java.util.ArrayList;
+import java.util.List;
 
 import com.ning.billing.ErrorCode;
 import com.ning.billing.catalog.api.BillingPeriod;
@@ -35,83 +34,82 @@ import com.ning.billing.util.config.ValidationErrors;
 
 @XmlAccessorType(XmlAccessType.NONE)
 public class DefaultPriceListSet extends ValidatingConfig<StandaloneCatalog> {
-	@XmlElement(required=true, name="defaultPriceList")
-	private PriceListDefault defaultPricelist;
-	
-	@XmlElement(required=false, name="childPriceList")
-	private DefaultPriceList[] childPriceLists = new DefaultPriceList[0];
-	
-	public DefaultPriceListSet() {
-		if(childPriceLists == null) {
-			childPriceLists = new DefaultPriceList[0];
-		}
-	}
-
-	public DefaultPriceListSet(PriceListDefault defaultPricelist, DefaultPriceList[] childPriceLists) {
-		this.defaultPricelist = defaultPricelist;
-		this.childPriceLists = childPriceLists;
-	}
-
-	public DefaultPlan getPlanFrom(String priceListName, Product product,
-			BillingPeriod period) throws CatalogApiException {
-		DefaultPlan result = null;
-		DefaultPriceList pl = findPriceListFrom(priceListName);
-		if(pl != null) {
-			result = pl.findPlan(product, period);
-		}
-		if(result != null) {
-			return result;
-		}
-		
-		return defaultPricelist.findPlan(product, period);
-	}
-
-	public DefaultPriceList findPriceListFrom (String priceListName) throws CatalogApiException {
-		if(priceListName == null) {
-			throw new CatalogApiException(ErrorCode.CAT_NULL_PRICE_LIST_NAME);
-		}
-		if (defaultPricelist.getName().equals(priceListName)) {
-			return defaultPricelist;
-		} 
-		for(DefaultPriceList pl : childPriceLists) {
-			if(pl.getName().equals(priceListName)) {
-				return pl;
-			}
-		}
-		throw new CatalogApiException(ErrorCode.CAT_PRICE_LIST_NOT_FOUND, priceListName);
-	}
-
-	@Override
-	public ValidationErrors validate(StandaloneCatalog catalog, ValidationErrors errors) {
-		defaultPricelist.validate(catalog, errors);
-		//Check that the default pricelist name is not in use in the children
-		for(DefaultPriceList pl : childPriceLists) {
-			if(pl.getName().equals(PriceListSet.DEFAULT_PRICELIST_NAME)){
-				errors.add(new ValidationError("Pricelists cannot use the reserved name '" + PriceListSet.DEFAULT_PRICELIST_NAME + "'",
-						catalog.getCatalogURI(), DefaultPriceListSet.class, pl.getName()));
-			}
-			pl.validate(catalog, errors); // and validate the individual pricelists
-		}
-		return errors;
-	}
-
-	public DefaultPriceList getDefaultPricelist() {
-		return defaultPricelist;
-	}
-
-	public DefaultPriceList[] getChildPriceLists() {
-		return childPriceLists;
-	}
+    @XmlElement(required = true, name = "defaultPriceList")
+    private PriceListDefault defaultPricelist;
+
+    @XmlElement(required = false, name = "childPriceList")
+    private DefaultPriceList[] childPriceLists = new DefaultPriceList[0];
+
+    public DefaultPriceListSet() {
+        if (childPriceLists == null) {
+            childPriceLists = new DefaultPriceList[0];
+        }
+    }
+
+    public DefaultPriceListSet(final PriceListDefault defaultPricelist, final DefaultPriceList[] childPriceLists) {
+        this.defaultPricelist = defaultPricelist;
+        this.childPriceLists = childPriceLists;
+    }
+
+    public DefaultPlan getPlanFrom(final String priceListName, final Product product,
+                                   final BillingPeriod period) throws CatalogApiException {
+        DefaultPlan result = null;
+        final DefaultPriceList pl = findPriceListFrom(priceListName);
+        if (pl != null) {
+            result = pl.findPlan(product, period);
+        }
+        if (result != null) {
+            return result;
+        }
+
+        return defaultPricelist.findPlan(product, period);
+    }
+
+    public DefaultPriceList findPriceListFrom(final String priceListName) throws CatalogApiException {
+        if (priceListName == null) {
+            throw new CatalogApiException(ErrorCode.CAT_NULL_PRICE_LIST_NAME);
+        }
+        if (defaultPricelist.getName().equals(priceListName)) {
+            return defaultPricelist;
+        }
+        for (final DefaultPriceList pl : childPriceLists) {
+            if (pl.getName().equals(priceListName)) {
+                return pl;
+            }
+        }
+        throw new CatalogApiException(ErrorCode.CAT_PRICE_LIST_NOT_FOUND, priceListName);
+    }
+
+    @Override
+    public ValidationErrors validate(final StandaloneCatalog catalog, final ValidationErrors errors) {
+        defaultPricelist.validate(catalog, errors);
+        //Check that the default pricelist name is not in use in the children
+        for (final DefaultPriceList pl : childPriceLists) {
+            if (pl.getName().equals(PriceListSet.DEFAULT_PRICELIST_NAME)) {
+                errors.add(new ValidationError("Pricelists cannot use the reserved name '" + PriceListSet.DEFAULT_PRICELIST_NAME + "'",
+                                               catalog.getCatalogURI(), DefaultPriceListSet.class, pl.getName()));
+            }
+            pl.validate(catalog, errors); // and validate the individual pricelists
+        }
+        return errors;
+    }
+
+    public DefaultPriceList getDefaultPricelist() {
+        return defaultPricelist;
+    }
+
+    public DefaultPriceList[] getChildPriceLists() {
+        return childPriceLists;
+    }
 
     public List<PriceList> getAllPriceLists() {
-        List<PriceList> result = new ArrayList<PriceList> (childPriceLists.length + 1);
+        final List<PriceList> result = new ArrayList<PriceList>(childPriceLists.length + 1);
         result.add(getDefaultPricelist());
-        for(PriceList list : getChildPriceLists()) {
+        for (final PriceList list : getChildPriceLists()) {
             result.add(list);
         }
         return result;
     }
 
 
-	
 }

diff --git a/catalog/src/main/java/com/ning/billing/catalog/DefaultProduct.java b/catalog/src/main/java/com/ning/billing/catalog/DefaultProduct.java
index 6687c75..0c14bc5 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/DefaultProduct.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/DefaultProduct.java
@@ -16,11 +16,6 @@
 
 package com.ning.billing.catalog;
 
-import com.ning.billing.catalog.api.Product;
-import com.ning.billing.catalog.api.ProductCategory;
-import com.ning.billing.util.config.ValidatingConfig;
-import com.ning.billing.util.config.ValidationErrors;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
@@ -29,133 +24,147 @@ import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlID;
 import javax.xml.bind.annotation.XmlIDREF;
 import java.net.URI;
+import java.util.Arrays;
+
+import com.ning.billing.catalog.api.Product;
+import com.ning.billing.catalog.api.ProductCategory;
+import com.ning.billing.util.config.ValidatingConfig;
+import com.ning.billing.util.config.ValidationErrors;
 
 @XmlAccessorType(XmlAccessType.NONE)
 public class DefaultProduct extends ValidatingConfig<StandaloneCatalog> implements Product {
-	private static final DefaultProduct[] EMPTY_PRODUCT_LIST = new DefaultProduct[0];
-	
-	@XmlAttribute(required=true)
-	@XmlID
+    private static final DefaultProduct[] EMPTY_PRODUCT_LIST = new DefaultProduct[0];
+
+    @XmlAttribute(required = true)
+    @XmlID
     private String name;
 
-	@XmlAttribute(required=false)
-	private Boolean retired = false;
-	
-	@XmlElement(required=true)
+    @XmlAttribute(required = false)
+    private Boolean retired = false;
+
+    @XmlElement(required = true)
     private ProductCategory category;
-	
-	@XmlElementWrapper(name="included", required=false)
-	@XmlIDREF @XmlElement(name="addonProduct", required=true)
+
+    @XmlElementWrapper(name = "included", required = false)
+    @XmlIDREF
+    @XmlElement(name = "addonProduct", required = true)
     private DefaultProduct[] included = EMPTY_PRODUCT_LIST;
 
-	@XmlElementWrapper(name="available", required=false)
-	@XmlIDREF @XmlElement(name="addonProduct", required=true)
+    @XmlElementWrapper(name = "available", required = false)
+    @XmlIDREF
+    @XmlElement(name = "addonProduct", required = true)
     private DefaultProduct[] available = EMPTY_PRODUCT_LIST;
 
-	//Not included in XML
-	private String catalogName;
-	
-	@Override
-	public String getCatalogName() {
-		return catalogName;
-	}
-
-	@Override
-	public boolean isRetired() {
-		return retired;
-	}
-	
-	@Override
+    //Not included in XML
+    private String catalogName;
+
+    @Override
+    public String getCatalogName() {
+        return catalogName;
+    }
+
+    @Override
+    public boolean isRetired() {
+        return retired;
+    }
+
+    @Override
     public ProductCategory getCategory() {
-		return category;
-	}
+        return category;
+    }
 
     @Override
-	public DefaultProduct[] getIncluded() {
-		return included;
-	}
+    public DefaultProduct[] getIncluded() {
+        return included;
+    }
 
     @Override
-	public DefaultProduct[] getAvailable() {
-		return available;
-	}
+    public DefaultProduct[] getAvailable() {
+        return available;
+    }
 
-	public DefaultProduct() {
+    public DefaultProduct() {
     }
 
-	public DefaultProduct(String name, ProductCategory category) {
-		this.category = category;
-		this.name = name;
+    public DefaultProduct(final String name, final ProductCategory category) {
+        this.category = category;
+        this.name = name;
     }
 
     @Override
-	public String getName() {
+    public String getName() {
         return name;
     }
 
-	public boolean isIncluded(DefaultProduct addon) {
-		for(DefaultProduct p : included) {
-			if (addon == p) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public boolean isAvailable(DefaultProduct addon) {
-		for(DefaultProduct p : included) {
-			if (addon == p) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	@Override
-	public void initialize(StandaloneCatalog catalog, URI sourceURI) {
-		catalogName = catalog.getCatalogName();
-	}
-
-	@Override
-	public ValidationErrors validate(StandaloneCatalog catalog, ValidationErrors errors) {
-		//TODO: MDW validation: inclusion and exclusion lists can only contain addon products
-		//TODO: MDW validation: a given product can only be in, at most, one of inclusion and exclusion lists
-		return errors;
-	}
-
-	protected DefaultProduct setName(String name) {
-		this.name = name;
-		return this;
-	}
-
-	protected DefaultProduct setCatagory(ProductCategory category) {
-		this.category = category;
-		return this;
-	}
-
-	protected DefaultProduct setCategory(ProductCategory category) {
-		this.category = category;
-		return this;
-	}
-
-	protected DefaultProduct setIncluded(DefaultProduct[] included) {
-		this.included = included;
-		return this;
-	}
-
-	protected DefaultProduct setAvailable(DefaultProduct[] available) {
-		this.available = available;
-		return this;
-	}
-
-	protected DefaultProduct setCatalogName(String catalogName) {
-		this.catalogName = catalogName;
-		return this;
-	}
-
-	public DefaultProduct setRetired(boolean retired) {
-		this.retired = retired;
-		return this;
-	}
+    public boolean isIncluded(final DefaultProduct addon) {
+        for (final DefaultProduct p : included) {
+            if (addon == p) {
+                return true;
+            }
+        }
+        return false;
+    }
 
+    public boolean isAvailable(final DefaultProduct addon) {
+        for (final DefaultProduct p : included) {
+            if (addon == p) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public void initialize(final StandaloneCatalog catalog, final URI sourceURI) {
+        catalogName = catalog.getCatalogName();
+    }
+
+    @Override
+    public ValidationErrors validate(final StandaloneCatalog catalog, final ValidationErrors errors) {
+        //TODO: MDW validation: inclusion and exclusion lists can only contain addon products
+        //TODO: MDW validation: a given product can only be in, at most, one of inclusion and exclusion lists
+        return errors;
+    }
+
+    protected DefaultProduct setName(final String name) {
+        this.name = name;
+        return this;
+    }
+
+    protected DefaultProduct setCatagory(final ProductCategory category) {
+        this.category = category;
+        return this;
+    }
+
+    protected DefaultProduct setCategory(final ProductCategory category) {
+        this.category = category;
+        return this;
+    }
+
+    protected DefaultProduct setIncluded(final DefaultProduct[] included) {
+        this.included = included;
+        return this;
+    }
+
+    protected DefaultProduct setAvailable(final DefaultProduct[] available) {
+        this.available = available;
+        return this;
+    }
+
+    protected DefaultProduct setCatalogName(final String catalogName) {
+        this.catalogName = catalogName;
+        return this;
+    }
+
+    public DefaultProduct setRetired(final boolean retired) {
+        this.retired = retired;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "DefaultProduct [name=" + name + ", retired=" + retired + ", category=" + category + ", included="
+                + Arrays.toString(included) + ", available=" + Arrays.toString(available) + ", catalogName="
+                + catalogName + "]";
+    }
 }

diff --git a/catalog/src/main/java/com/ning/billing/catalog/io/ICatalogLoader.java b/catalog/src/main/java/com/ning/billing/catalog/io/ICatalogLoader.java
index 4d1f139..d20a360 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/io/ICatalogLoader.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/io/ICatalogLoader.java
@@ -21,7 +21,7 @@ import com.ning.billing.lifecycle.KillbillService.ServiceException;
 
 public interface ICatalogLoader {
 
-	public abstract VersionedCatalog load(String urlString)
-			throws ServiceException;
+    public abstract VersionedCatalog load(String urlString)
+            throws ServiceException;
 
-}
\ No newline at end of file
+}

diff --git a/catalog/src/main/java/com/ning/billing/catalog/io/VersionedCatalogLoader.java b/catalog/src/main/java/com/ning/billing/catalog/io/VersionedCatalogLoader.java
index 7ef0600..95f5590 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/io/VersionedCatalogLoader.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/io/VersionedCatalogLoader.java
@@ -16,6 +16,12 @@
 
 package com.ning.billing.catalog.io;
 
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
 import com.google.inject.Inject;
 import com.ning.billing.catalog.StandaloneCatalog;
 import com.ning.billing.catalog.VersionedCatalog;
@@ -24,123 +30,120 @@ import com.ning.billing.util.clock.Clock;
 import com.ning.billing.util.config.UriAccessor;
 import com.ning.billing.util.config.XMLLoader;
 
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+public class VersionedCatalogLoader implements ICatalogLoader {
+    private static final Object PROTOCOL_FOR_FILE = "file";
+    private final String XML_EXTENSION = ".xml";
+    private final Clock clock;
+
+    @Inject
+    public VersionedCatalogLoader(final Clock clock) {
+        this.clock = clock;
+    }
+
+    /* (non-Javadoc)
+      * @see com.ning.billing.catalog.io.ICatalogLoader#load(java.lang.String)
+      */
+    @Override
+    public VersionedCatalog load(final String uriString) throws ServiceException {
+        try {
+            List<URI> xmlURIs = null;
+
+            if (uriString.endsWith(XML_EXTENSION)) { //assume its an xml file
+                xmlURIs = new ArrayList<URI>();
+                xmlURIs.add(new URI(uriString));
+            } else { //assume its a directory
+                final String directoryContents = UriAccessor.accessUriAsString(uriString);
+                xmlURIs = findXmlReferences(directoryContents, new URL(uriString));
+            }
+
+            final VersionedCatalog result = new VersionedCatalog(clock);
+            for (final URI u : xmlURIs) {
+                final StandaloneCatalog catalog = XMLLoader.getObjectFromUri(u, StandaloneCatalog.class);
+                result.add(catalog);
+            }
+            return result;
+        } catch (Exception e) {
+            throw new ServiceException("Problem encountered loading catalog", e);
+        }
+    }
+
+    protected List<URI> findXmlReferences(final String directoryContents, final URL url) throws URISyntaxException {
+        if (url.getProtocol().equals(PROTOCOL_FOR_FILE)) {
+            return findXmlFileReferences(directoryContents, url);
+        }
+        return findXmlUrlReferences(directoryContents, url);
+    }
+
+    protected List<URI> findXmlUrlReferences(final String directoryContents, final URL url) throws URISyntaxException {
+        final List<URI> results = new ArrayList<URI>();
+        final List<String> urlFragments = extractHrefs(directoryContents);
+        for (final String u : urlFragments) {
+            if (u.endsWith(XML_EXTENSION)) { //points to xml
+                if (u.startsWith("/")) { //absolute path need to add the protocol
+                    results.add(new URI(url.getProtocol() + ":" + u));
+                } else if (u.startsWith("http:")) { // full url
+                    results.add(new URI(u));
+                } else { // relative url stick the name on the end
+                    results.add(appendToURI(url, u));
+                }
+            }
+        }
+        return results;
+    }
+
+    protected List<String> extractHrefs(final String directoryContents) {
+        final List<String> results = new ArrayList<String>();
+        int start = 0;
+        int end = 0;
+        final String HREF_SEARCH_END = "\"";
+        final String HREF_LOW_START = "href=\"";
+        while (start >= 0) {
+            start = directoryContents.indexOf(HREF_LOW_START, end);
+            if (start > 0) {
+                start = start + HREF_LOW_START.length();
+            }
+
+            end = directoryContents.indexOf(HREF_SEARCH_END, start);
+            if (start >= 0) { // We found something
+                results.add(directoryContents.substring(start, end));
+            }
+        }
+
+        start = 0;
+        end = 0;
+        while (start >= 0) {
+            final String HREF_CAPS_START = "HREF=\"";
+            start = directoryContents.indexOf(HREF_CAPS_START, end);
+            if (start > 0) {
+                start = +HREF_LOW_START.length();
+            }
+
+            end = directoryContents.indexOf(HREF_SEARCH_END, start);
+            if (start >= 0) { // We found something
+                results.add(directoryContents.substring(start, end));
+            }
+        }
+        return results;
+    }
+
+    protected List<URI> findXmlFileReferences(final String directoryContents, final URL url) throws URISyntaxException {
+        final List<URI> results = new ArrayList<URI>();
+        final String[] filenames = directoryContents.split("\\n");
+        for (final String filename : filenames) {
+            if (filename.endsWith(XML_EXTENSION)) {
+                results.add(appendToURI(url, filename));
+            }
+        }
+        return results;
+    }
+
+    protected URI appendToURI(final URL url, final String filename) throws URISyntaxException {
+        String f = filename;
+        if (!url.toString().endsWith("/")) {
+            f = "/" + filename;
+        }
+        return new URI(url.toString() + f);
+    }
+
 
-public class VersionedCatalogLoader implements ICatalogLoader  {
-	private static final Object PROTOCOL_FOR_FILE = "file";
-	private  final String XML_EXTENSION = ".xml";
-	private  final String HREF_LOW_START = "href=\""; 
-	private  final String HREF_CAPS_START = "HREF=\""; 
-	private  final String HREF_SEARCH_END = "\"";
-	private Clock clock;
-			
-	@Inject 
-	public VersionedCatalogLoader(Clock clock) {
-		this.clock = clock;
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ning.billing.catalog.io.ICatalogLoader#load(java.lang.String)
-	 */
-	@Override
-	public  VersionedCatalog load(String uriString) throws ServiceException{
-		try {
-			List<URI> xmlURIs = null;
-			
-			if(uriString.endsWith(XML_EXTENSION)) { //assume its an xml file
-				xmlURIs = new ArrayList<URI>();
-	        	xmlURIs.add(new URI(uriString));
-			} else { //assume its a directory
-				String directoryContents = UriAccessor.accessUriAsString(uriString);
-				xmlURIs = findXmlReferences(directoryContents, new URL(uriString));
-			}
-			
-			VersionedCatalog result = new VersionedCatalog(clock);
-			for(URI u : xmlURIs) {
-				StandaloneCatalog catalog = XMLLoader.getObjectFromUri(u, StandaloneCatalog.class);
-				result.add(catalog);
-			}
-			return result;
-		} catch (Exception e) {
-			throw new ServiceException("Problem encountered loading catalog", e);
-		}
-	}
-	
-	protected  List<URI> findXmlReferences(String directoryContents, URL url) throws URISyntaxException {
-		if(url.getProtocol().equals(PROTOCOL_FOR_FILE)) {
-			return findXmlFileReferences(directoryContents, url);
-		} 
-		return findXmlUrlReferences(directoryContents, url);
-	}
-
-	protected  List<URI> findXmlUrlReferences(String directoryContents, URL url) throws URISyntaxException {
-		List<URI> results = new ArrayList<URI>();
-		List<String> urlFragments = extractHrefs(directoryContents);
-		for(String u : urlFragments) {
-			if(u.endsWith(XML_EXTENSION)) { //points to xml
-				if(u.startsWith("/")) { //absolute path need to add the protocol
-					results.add(new URI(url.getProtocol() + ":" + u));
-				} else if (u.startsWith("http:")) { // full url
-					results.add(new URI(u));
-				} else { // relative url stick the name on the end
-					results.add(appendToURI(url,u));
-				}
-			}
-		}
-		return results;
-	}
-
-	protected  List<String> extractHrefs(String directoryContents) {
-		List<String> results = new ArrayList<String>();
-		int start = 0;
-		int end = 0;
-		while(start >= 0) {
-			start = directoryContents.indexOf(HREF_LOW_START, end);
-			if (start > 0) start = start + HREF_LOW_START.length();
-					
-			end = directoryContents.indexOf(HREF_SEARCH_END, start);
-			if(start >= 0) { // We found something
-				results.add(directoryContents.substring(start, end));
-			}
-		}
-		
-		start = 0;
-		end = 0;
-		while(start >= 0) {
-			start = directoryContents.indexOf(HREF_CAPS_START, end);
-			if (start > 0) start =+ HREF_LOW_START.length();
-			
-			end = directoryContents.indexOf(HREF_SEARCH_END, start);
-			if(start >= 0) { // We found something
-				results.add(directoryContents.substring(start, end));
-			}
-		}
-		return results;
-	}
-
-	protected  List<URI> findXmlFileReferences(String directoryContents, URL url) throws URISyntaxException {
-		List<URI> results = new ArrayList<URI>();
-		String[] filenames = directoryContents.split("\\n");
-		for(String filename : filenames) {
-			if(filename.endsWith(XML_EXTENSION)) {
-				results.add(appendToURI(url,filename));
-			}
-		}
-		return results;
-	}
-
-	protected  URI appendToURI(final URL url, final String filename) throws URISyntaxException {
-		String f = filename;
-		if (!url.toString().endsWith("/")) {
-			f = "/" + filename;
-		}
-		return new URI(url.toString() + f);
-	}
-
-	
 }

diff --git a/catalog/src/main/java/com/ning/billing/catalog/PriceListDefault.java b/catalog/src/main/java/com/ning/billing/catalog/PriceListDefault.java
index f667e17..91bdc43 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/PriceListDefault.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/PriceListDefault.java
@@ -16,36 +16,37 @@
 
 package com.ning.billing.catalog;
 
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+
 import com.ning.billing.catalog.api.PriceListSet;
 import com.ning.billing.util.config.ValidationError;
 import com.ning.billing.util.config.ValidationErrors;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-
 @XmlAccessorType(XmlAccessType.NONE)
 public class PriceListDefault extends DefaultPriceList {
-	
-	public PriceListDefault(){}
-	
-	public PriceListDefault(DefaultPlan[] defaultPlans) {
-		super(defaultPlans, PriceListSet.DEFAULT_PRICELIST_NAME);
-	}
-
-	@Override
-	public ValidationErrors validate(StandaloneCatalog catalog, ValidationErrors errors) {
-		super.validate(catalog, errors);
-		if(!getName().equals(PriceListSet.DEFAULT_PRICELIST_NAME)) {
-			errors.add(new ValidationError("The name of the default pricelist must be 'DEFAULT'", 
-					catalog.getCatalogURI(), DefaultPriceList.class, getName()));
-			
-		}
-		return errors;
-	}
-
-	@Override
-	public String getName() {
-		return PriceListSet.DEFAULT_PRICELIST_NAME;
-	}
+
+    public PriceListDefault() {
+    }
+
+    public PriceListDefault(final DefaultPlan[] defaultPlans) {
+        super(defaultPlans, PriceListSet.DEFAULT_PRICELIST_NAME);
+    }
+
+    @Override
+    public ValidationErrors validate(final StandaloneCatalog catalog, final ValidationErrors errors) {
+        super.validate(catalog, errors);
+        if (!getName().equals(PriceListSet.DEFAULT_PRICELIST_NAME)) {
+            errors.add(new ValidationError("The name of the default pricelist must be 'DEFAULT'",
+                                           catalog.getCatalogURI(), DefaultPriceList.class, getName()));
+
+        }
+        return errors;
+    }
+
+    @Override
+    public String getName() {
+        return PriceListSet.DEFAULT_PRICELIST_NAME;
+    }
 
 }

diff --git a/catalog/src/main/java/com/ning/billing/catalog/rules/Case.java b/catalog/src/main/java/com/ning/billing/catalog/rules/Case.java
index 7ae442f..e1a75f9 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/rules/Case.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/rules/Case.java
@@ -29,53 +29,53 @@ import com.ning.billing.util.config.ValidationErrors;
 
 public abstract class Case<T> extends ValidatingConfig<StandaloneCatalog> {
 
-	protected abstract T getResult();
-	
-	public abstract DefaultProduct getProduct();
-
-	public abstract ProductCategory getProductCategory();
-
-	public abstract BillingPeriod getBillingPeriod();
-	    
-	public abstract DefaultPriceList getPriceList();
-
-	public T getResult(PlanSpecifier planPhase, StandaloneCatalog c) throws CatalogApiException {
-		if (satisfiesCase(planPhase, c)	) {
-			return getResult(); 
-		}
-		return null;
-	}
-	
-	protected boolean satisfiesCase(PlanSpecifier planPhase, StandaloneCatalog c) throws CatalogApiException {
-		return (getProduct()         == null || getProduct().equals(c.findCurrentProduct(planPhase.getProductName()))) &&
-		(getProductCategory() == null || getProductCategory().equals(planPhase.getProductCategory())) &&
-		(getBillingPeriod()   == null || getBillingPeriod().equals(planPhase.getBillingPeriod())) &&
-		(getPriceList()       == null || getPriceList().equals(c.findCurrentPriceList(planPhase.getPriceListName())));
-	}
-
-	public static <K> K getResult(Case<K>[] cases, PlanSpecifier planSpec, StandaloneCatalog catalog) throws CatalogApiException {
-    	if(cases != null) {
-    		for(Case<K> c : cases) {
-    			K result = c.getResult(planSpec, catalog);
-    			if(result != null) { 
-    				return result; 
-    			}        					
-    		}
-    	}
+    protected abstract T getResult();
+
+    public abstract DefaultProduct getProduct();
+
+    public abstract ProductCategory getProductCategory();
+
+    public abstract BillingPeriod getBillingPeriod();
+
+    public abstract DefaultPriceList getPriceList();
+
+    public T getResult(final PlanSpecifier planPhase, final StandaloneCatalog c) throws CatalogApiException {
+        if (satisfiesCase(planPhase, c)) {
+            return getResult();
+        }
         return null;
-        
     }
-	
-	@Override
-	public ValidationErrors validate(StandaloneCatalog catalog, ValidationErrors errors) {
-		return errors;
-	}
 
-	protected abstract Case<T> setProduct(DefaultProduct product);
+    protected boolean satisfiesCase(final PlanSpecifier planPhase, final StandaloneCatalog c) throws CatalogApiException {
+        return (getProduct() == null || getProduct().equals(c.findCurrentProduct(planPhase.getProductName()))) &&
+                (getProductCategory() == null || getProductCategory().equals(planPhase.getProductCategory())) &&
+                (getBillingPeriod() == null || getBillingPeriod().equals(planPhase.getBillingPeriod())) &&
+                (getPriceList() == null || getPriceList().equals(c.findCurrentPriceList(planPhase.getPriceListName())));
+    }
+
+    public static <K> K getResult(final Case<K>[] cases, final PlanSpecifier planSpec, final StandaloneCatalog catalog) throws CatalogApiException {
+        if (cases != null) {
+            for (final Case<K> c : cases) {
+                final K result = c.getResult(planSpec, catalog);
+                if (result != null) {
+                    return result;
+                }
+            }
+        }
+        return null;
+
+    }
+
+    @Override
+    public ValidationErrors validate(final StandaloneCatalog catalog, final ValidationErrors errors) {
+        return errors;
+    }
+
+    protected abstract Case<T> setProduct(DefaultProduct product);
 
-	protected abstract  Case<T> setProductCategory(ProductCategory productCategory);
+    protected abstract Case<T> setProductCategory(ProductCategory productCategory);
 
-	protected abstract  Case<T> setBillingPeriod(BillingPeriod billingPeriod);
+    protected abstract Case<T> setBillingPeriod(BillingPeriod billingPeriod);
 
-	protected abstract  Case<T> setPriceList(DefaultPriceList priceList);
+    protected abstract Case<T> setPriceList(DefaultPriceList priceList);
 }

diff --git a/catalog/src/main/java/com/ning/billing/catalog/rules/CaseBillingAlignment.java b/catalog/src/main/java/com/ning/billing/catalog/rules/CaseBillingAlignment.java
index 8b8c9ab..e72a37e 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/rules/CaseBillingAlignment.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/rules/CaseBillingAlignment.java
@@ -22,18 +22,18 @@ import com.ning.billing.catalog.api.BillingAlignment;
 
 public class CaseBillingAlignment extends CasePhase<BillingAlignment> {
 
-	@XmlElement(required=true)
-	private BillingAlignment alignment;
-
-	@Override
-	protected BillingAlignment getResult() {
-		return alignment;
-	}
-
-	protected CaseBillingAlignment setAlignment(BillingAlignment alignment) {
-		this.alignment = alignment;
-		return this;
-	}
-	
-	
+    @XmlElement(required = true)
+    private BillingAlignment alignment;
+
+    @Override
+    protected BillingAlignment getResult() {
+        return alignment;
+    }
+
+    protected CaseBillingAlignment setAlignment(final BillingAlignment alignment) {
+        this.alignment = alignment;
+        return this;
+    }
+
+
 }

diff --git a/catalog/src/main/java/com/ning/billing/catalog/rules/CaseCancelPolicy.java b/catalog/src/main/java/com/ning/billing/catalog/rules/CaseCancelPolicy.java
index eb49803..dcf3358 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/rules/CaseCancelPolicy.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/rules/CaseCancelPolicy.java
@@ -20,19 +20,19 @@ import javax.xml.bind.annotation.XmlElement;
 
 import com.ning.billing.catalog.api.ActionPolicy;
 
-public class CaseCancelPolicy extends CasePhase<ActionPolicy>{
+public class CaseCancelPolicy extends CasePhase<ActionPolicy> {
 
-	@XmlElement(required=true)
-	private ActionPolicy policy;
+    @XmlElement(required = true)
+    private ActionPolicy policy;
 
-	@Override
-	protected ActionPolicy getResult() {
-		return policy;
-	}
+    @Override
+    protected ActionPolicy getResult() {
+        return policy;
+    }
 
-	protected CaseCancelPolicy setPolicy(ActionPolicy policy) {
-		this.policy = policy;
-		return this;
-	}
+    protected CaseCancelPolicy setPolicy(final ActionPolicy policy) {
+        this.policy = policy;
+        return this;
+    }
 
 }

diff --git a/catalog/src/main/java/com/ning/billing/catalog/rules/CaseChange.java b/catalog/src/main/java/com/ning/billing/catalog/rules/CaseChange.java
index 963dc2f..fd243a2 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/rules/CaseChange.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/rules/CaseChange.java
@@ -16,6 +16,11 @@
 
 package com.ning.billing.catalog.rules;
 
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlIDREF;
+
 import com.ning.billing.catalog.DefaultPriceList;
 import com.ning.billing.catalog.DefaultProduct;
 import com.ning.billing.catalog.StandaloneCatalog;
@@ -28,127 +33,122 @@ import com.ning.billing.catalog.api.ProductCategory;
 import com.ning.billing.util.config.ValidatingConfig;
 import com.ning.billing.util.config.ValidationErrors;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlIDREF;
-
 @XmlAccessorType(XmlAccessType.NONE)
-public abstract class CaseChange<T>  extends ValidatingConfig<StandaloneCatalog> {
-
-	@XmlElement(required=false)
-	private PhaseType phaseType;
-
-	@XmlElement(required=false)
-	@XmlIDREF
-	private DefaultProduct fromProduct;
-
-	@XmlElement(required=false)
-	private ProductCategory fromProductCategory;
-
-	@XmlElement(required=false)
-	private BillingPeriod fromBillingPeriod;
-
-	@XmlElement(required=false)
-	@XmlIDREF
-	private DefaultPriceList fromPriceList;
-
-	@XmlElement(required=false)
-	@XmlIDREF
-	private DefaultProduct toProduct;
-
-	@XmlElement(required=false)
-	private ProductCategory toProductCategory;
-
-	@XmlElement(required=false)
-	private BillingPeriod toBillingPeriod;
-
-	@XmlElement(required=false)
-	@XmlIDREF
-	private DefaultPriceList toPriceList;
-
-	protected abstract T getResult();
-	
-	public T getResult(PlanPhaseSpecifier from,
-			PlanSpecifier to, StandaloneCatalog catalog) throws CatalogApiException {
-		if(	
-				(phaseType     	     == null || from.getPhaseType() == phaseType) &&
-				(fromProduct 	     == null || fromProduct.equals(catalog.findCurrentProduct(from.getProductName()))) &&
-				(fromProductCategory == null || fromProductCategory.equals(from.getProductCategory())) &&
-				(fromBillingPeriod   == null || fromBillingPeriod.equals(from.getBillingPeriod())) &&
-				(toProduct           == null || toProduct.equals(catalog.findCurrentProduct(to.getProductName()))) &&
-				(toProductCategory   == null || toProductCategory.equals(to.getProductCategory())) &&
-				(toBillingPeriod     == null || toBillingPeriod.equals(to.getBillingPeriod())) &&
-				(fromPriceList       == null || fromPriceList.equals(catalog.findCurrentPriceList(from.getPriceListName()))) &&
-				(toPriceList         == null || toPriceList.equals(catalog.findCurrentPriceList(to.getPriceListName())))
-				) {
-			return getResult();
-		}
-		return null;
-	}
-	
-	static public <K> K getResult(CaseChange<K>[] cases, PlanPhaseSpecifier from,
-			PlanSpecifier to, StandaloneCatalog catalog) throws CatalogApiException {
-    	if(cases != null) {
-    		for(CaseChange<K> cc : cases) {
-    			K result = cc.getResult(from, to, catalog);
-    			if(result != null) { 
-    				return result; 
-    			}        					
-    		}
-    	}
+public abstract class CaseChange<T> extends ValidatingConfig<StandaloneCatalog> {
+
+    @XmlElement(required = false)
+    private PhaseType phaseType;
+
+    @XmlElement(required = false)
+    @XmlIDREF
+    private DefaultProduct fromProduct;
+
+    @XmlElement(required = false)
+    private ProductCategory fromProductCategory;
+
+    @XmlElement(required = false)
+    private BillingPeriod fromBillingPeriod;
+
+    @XmlElement(required = false)
+    @XmlIDREF
+    private DefaultPriceList fromPriceList;
+
+    @XmlElement(required = false)
+    @XmlIDREF
+    private DefaultProduct toProduct;
+
+    @XmlElement(required = false)
+    private ProductCategory toProductCategory;
+
+    @XmlElement(required = false)
+    private BillingPeriod toBillingPeriod;
+
+    @XmlElement(required = false)
+    @XmlIDREF
+    private DefaultPriceList toPriceList;
+
+    protected abstract T getResult();
+
+    public T getResult(final PlanPhaseSpecifier from,
+                       final PlanSpecifier to, final StandaloneCatalog catalog) throws CatalogApiException {
+        if (
+                (phaseType == null || from.getPhaseType() == phaseType) &&
+                        (fromProduct == null || fromProduct.equals(catalog.findCurrentProduct(from.getProductName()))) &&
+                        (fromProductCategory == null || fromProductCategory.equals(from.getProductCategory())) &&
+                        (fromBillingPeriod == null || fromBillingPeriod.equals(from.getBillingPeriod())) &&
+                        (toProduct == null || toProduct.equals(catalog.findCurrentProduct(to.getProductName()))) &&
+                        (toProductCategory == null || toProductCategory.equals(to.getProductCategory())) &&
+                        (toBillingPeriod == null || toBillingPeriod.equals(to.getBillingPeriod())) &&
+                        (fromPriceList == null || fromPriceList.equals(catalog.findCurrentPriceList(from.getPriceListName()))) &&
+                        (toPriceList == null || toPriceList.equals(catalog.findCurrentPriceList(to.getPriceListName())))
+                ) {
+            return getResult();
+        }
+        return null;
+    }
+
+    public static <K> K getResult(final CaseChange<K>[] cases, final PlanPhaseSpecifier from,
+                                  final PlanSpecifier to, final StandaloneCatalog catalog) throws CatalogApiException {
+        if (cases != null) {
+            for (final CaseChange<K> cc : cases) {
+                final K result = cc.getResult(from, to, catalog);
+                if (result != null) {
+                    return result;
+                }
+            }
+        }
         return null;
-        
+
+    }
+
+    @Override
+    public ValidationErrors validate(final StandaloneCatalog catalog, final ValidationErrors errors) {
+        return errors;
+    }
+
+    protected CaseChange<T> setPhaseType(final PhaseType phaseType) {
+        this.phaseType = phaseType;
+        return this;
+    }
+
+    protected CaseChange<T> setFromProduct(final DefaultProduct fromProduct) {
+        this.fromProduct = fromProduct;
+        return this;
+    }
+
+    protected CaseChange<T> setFromProductCategory(final ProductCategory fromProductCategory) {
+        this.fromProductCategory = fromProductCategory;
+        return this;
+    }
+
+    protected CaseChange<T> setFromBillingPeriod(final BillingPeriod fromBillingPeriod) {
+        this.fromBillingPeriod = fromBillingPeriod;
+        return this;
+    }
+
+    protected CaseChange<T> setFromPriceList(final DefaultPriceList fromPriceList) {
+        this.fromPriceList = fromPriceList;
+        return this;
+    }
+
+    protected CaseChange<T> setToProduct(final DefaultProduct toProduct) {
+        this.toProduct = toProduct;
+        return this;
+    }
+
+    protected CaseChange<T> setToProductCategory(final ProductCategory toProductCategory) {
+        this.toProductCategory = toProductCategory;
+        return this;
+    }
+
+    protected CaseChange<T> setToBillingPeriod(final BillingPeriod toBillingPeriod) {
+        this.toBillingPeriod = toBillingPeriod;
+        return this;
+    }
+
+    protected CaseChange<T> setToPriceList(final DefaultPriceList toPriceList) {
+        this.toPriceList = toPriceList;
+        return this;
     }
-	
-	@Override
-	public ValidationErrors validate(StandaloneCatalog catalog, ValidationErrors errors) {
-		return errors;
-	}
-
-	protected CaseChange<T> setPhaseType(PhaseType phaseType) {
-		this.phaseType = phaseType;
-		return this;
-	}
-
-	protected CaseChange<T> setFromProduct(DefaultProduct fromProduct) {
-		this.fromProduct = fromProduct;
-		return this;
-	}
-
-	protected CaseChange<T> setFromProductCategory(ProductCategory fromProductCategory) {
-		this.fromProductCategory = fromProductCategory;
-		return this;
-	}
-
-	protected CaseChange<T> setFromBillingPeriod(BillingPeriod fromBillingPeriod) {
-		this.fromBillingPeriod = fromBillingPeriod;
-		return this;
-	}
-
-	protected CaseChange<T> setFromPriceList(DefaultPriceList fromPriceList) {
-		this.fromPriceList = fromPriceList;
-		return this;
-	}
-
-	protected CaseChange<T> setToProduct(DefaultProduct toProduct) {
-		this.toProduct = toProduct;
-		return this;
-	}
-
-	protected CaseChange<T> setToProductCategory(ProductCategory toProductCategory) {
-		this.toProductCategory = toProductCategory;
-		return this;
-	}
-
-	protected CaseChange<T> setToBillingPeriod(BillingPeriod toBillingPeriod) {
-		this.toBillingPeriod = toBillingPeriod;
-		return this;
-	}
-
-	protected CaseChange<T> setToPriceList(DefaultPriceList toPriceList) {
-		this.toPriceList = toPriceList;
-		return this;
-	}
 
 }

diff --git a/catalog/src/main/java/com/ning/billing/catalog/rules/CaseChangePlanAlignment.java b/catalog/src/main/java/com/ning/billing/catalog/rules/CaseChangePlanAlignment.java
index 3186288..1c92cca 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/rules/CaseChangePlanAlignment.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/rules/CaseChangePlanAlignment.java
@@ -22,17 +22,17 @@ import com.ning.billing.catalog.api.PlanAlignmentChange;
 
 public class CaseChangePlanAlignment extends CaseChange<PlanAlignmentChange> {
 
-	@XmlElement(required=true)
-	private PlanAlignmentChange alignment;
-
-	@Override
-	protected PlanAlignmentChange getResult() {
-		return alignment;
-	}
-
-	protected CaseChangePlanAlignment setAlignment(PlanAlignmentChange alignment) {
-		this.alignment = alignment;
-		return this;
-	}
-	
+    @XmlElement(required = true)
+    private PlanAlignmentChange alignment;
+
+    @Override
+    protected PlanAlignmentChange getResult() {
+        return alignment;
+    }
+
+    protected CaseChangePlanAlignment setAlignment(final PlanAlignmentChange alignment) {
+        this.alignment = alignment;
+        return this;
+    }
+
 }

diff --git a/catalog/src/main/java/com/ning/billing/catalog/rules/CaseChangePlanPolicy.java b/catalog/src/main/java/com/ning/billing/catalog/rules/CaseChangePlanPolicy.java
index f6862f9..321f500 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/rules/CaseChangePlanPolicy.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/rules/CaseChangePlanPolicy.java
@@ -23,18 +23,18 @@ import com.ning.billing.catalog.api.ActionPolicy;
 
 @XmlSeeAlso(CaseChange.class)
 public class CaseChangePlanPolicy extends CaseChange<ActionPolicy> {
-	
-	@XmlElement(required=true)
-	private ActionPolicy policy;
-
-	@Override
-	protected ActionPolicy getResult() {
-		return policy;
-	}
-
-	protected CaseChangePlanPolicy setPolicy(ActionPolicy policy) {
-		this.policy = policy;
-		return this;
-	}
-	
+
+    @XmlElement(required = true)
+    private ActionPolicy policy;
+
+    @Override
+    protected ActionPolicy getResult() {
+        return policy;
+    }
+
+    protected CaseChangePlanPolicy setPolicy(final ActionPolicy policy) {
+        this.policy = policy;
+        return this;
+    }
+
 }

diff --git a/catalog/src/main/java/com/ning/billing/catalog/rules/CaseCreateAlignment.java b/catalog/src/main/java/com/ning/billing/catalog/rules/CaseCreateAlignment.java
index 39f6607..77b0eb5 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/rules/CaseCreateAlignment.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/rules/CaseCreateAlignment.java
@@ -20,19 +20,19 @@ import javax.xml.bind.annotation.XmlElement;
 
 import com.ning.billing.catalog.api.PlanAlignmentCreate;
 
-public class CaseCreateAlignment extends CaseStandardNaming<PlanAlignmentCreate>{
+public class CaseCreateAlignment extends CaseStandardNaming<PlanAlignmentCreate> {
 
-	@XmlElement(required=true)
-	private PlanAlignmentCreate alignment;
+    @XmlElement(required = true)
+    private PlanAlignmentCreate alignment;
 
-	@Override
-	protected PlanAlignmentCreate getResult() {
-		return alignment;
-	}
+    @Override
+    protected PlanAlignmentCreate getResult() {
+        return alignment;
+    }
+
+    protected CaseCreateAlignment setAlignment(final PlanAlignmentCreate alignment) {
+        this.alignment = alignment;
+        return this;
+    }
 
-	protected CaseCreateAlignment setAlignment(PlanAlignmentCreate alignment) {
-		this.alignment = alignment;
-		return this;
-	}
-	
 }

diff --git a/catalog/src/main/java/com/ning/billing/catalog/rules/CasePhase.java b/catalog/src/main/java/com/ning/billing/catalog/rules/CasePhase.java
index ebd7561..b7d71da 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/rules/CasePhase.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/rules/CasePhase.java
@@ -16,6 +16,8 @@
 
 package com.ning.billing.catalog.rules;
 
+import javax.xml.bind.annotation.XmlElement;
+
 import com.ning.billing.catalog.StandaloneCatalog;
 import com.ning.billing.catalog.api.CatalogApiException;
 import com.ning.billing.catalog.api.PhaseType;
@@ -23,44 +25,42 @@ import com.ning.billing.catalog.api.PlanPhaseSpecifier;
 import com.ning.billing.catalog.api.PlanSpecifier;
 import com.ning.billing.util.config.ValidationErrors;
 
-import javax.xml.bind.annotation.XmlElement;
-
 public abstract class CasePhase<T> extends CaseStandardNaming<T> {
 
-	@XmlElement(required=false)
-	private PhaseType phaseType;	
-	
-	public T getResult(PlanPhaseSpecifier specifier, StandaloneCatalog c) throws CatalogApiException {
-		if ((phaseType       == null ||  specifier.getPhaseType() == phaseType) 
-				&& satisfiesCase(new PlanSpecifier(specifier), c)
-				) {
-			return getResult(); 
-		}
-		return null;
-	}
-	
-	public static <K> K getResult(CasePhase<K>[] cases, PlanPhaseSpecifier planSpec, StandaloneCatalog catalog) throws CatalogApiException {
-    	if(cases != null) {
-    		for(CasePhase<K> cp : cases) {
-    			K result = cp.getResult(planSpec, catalog);
-    			if(result != null) { 
-    				return result; 
-    			}        					
-    		}
-    	}
+    @XmlElement(required = false)
+    private PhaseType phaseType;
+
+    public T getResult(final PlanPhaseSpecifier specifier, final StandaloneCatalog c) throws CatalogApiException {
+        if ((phaseType == null || specifier.getPhaseType() == phaseType)
+                && satisfiesCase(new PlanSpecifier(specifier), c)
+                ) {
+            return getResult();
+        }
         return null;
-        
     }
 
-	@Override
-	public ValidationErrors validate(StandaloneCatalog catalog, ValidationErrors errors) {
-		return errors;
-	}
+    public static <K> K getResult(final CasePhase<K>[] cases, final PlanPhaseSpecifier planSpec, final StandaloneCatalog catalog) throws CatalogApiException {
+        if (cases != null) {
+            for (final CasePhase<K> cp : cases) {
+                final K result = cp.getResult(planSpec, catalog);
+                if (result != null) {
+                    return result;
+                }
+            }
+        }
+        return null;
+
+    }
+
+    @Override
+    public ValidationErrors validate(final StandaloneCatalog catalog, final ValidationErrors errors) {
+        return errors;
+    }
+
+    protected CasePhase<T> setPhaseType(final PhaseType phaseType) {
+        this.phaseType = phaseType;
+        return this;
+    }
+
 
-	protected CasePhase<T> setPhaseType(PhaseType phaseType) {
-		this.phaseType = phaseType;
-		return this;
-	}
-	
-	
 }

diff --git a/catalog/src/main/java/com/ning/billing/catalog/rules/CasePriceList.java b/catalog/src/main/java/com/ning/billing/catalog/rules/CasePriceList.java
index 5063131..2777ec7 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/rules/CasePriceList.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/rules/CasePriceList.java
@@ -16,34 +16,34 @@
 
 package com.ning.billing.catalog.rules;
 
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlIDREF;
+
 import com.ning.billing.catalog.DefaultPriceList;
 import com.ning.billing.catalog.DefaultProduct;
 import com.ning.billing.catalog.api.BillingPeriod;
 import com.ning.billing.catalog.api.ProductCategory;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlIDREF;
-
 public class CasePriceList extends Case<DefaultPriceList> {
-    @XmlElement(required=false, name="fromProduct")
+    @XmlElement(required = false, name = "fromProduct")
     @XmlIDREF
     private DefaultProduct fromProduct;
-    
-    @XmlElement(required=false, name="fromProductCategory")
+
+    @XmlElement(required = false, name = "fromProductCategory")
     private ProductCategory fromProductCategory;
-    
-    @XmlElement(required=false, name="fromBillingPeriod")
+
+    @XmlElement(required = false, name = "fromBillingPeriod")
     private BillingPeriod fromBillingPeriod;
-    
-    @XmlElement(required=false, name="fromPriceList")
+
+    @XmlElement(required = false, name = "fromPriceList")
     @XmlIDREF
     private DefaultPriceList fromPriceList;
 
-    @XmlElement(required=true, name="toPriceList")
+    @XmlElement(required = true, name = "toPriceList")
     @XmlIDREF
     private DefaultPriceList toPriceList;
 
-    public DefaultProduct getProduct(){
+    public DefaultProduct getProduct() {
         return fromProduct;
     }
 
@@ -54,7 +54,7 @@ public class CasePriceList extends Case<DefaultPriceList> {
     public BillingPeriod getBillingPeriod() {
         return fromBillingPeriod;
     }
-    
+
     public DefaultPriceList getPriceList() {
         return fromPriceList;
     }
@@ -63,33 +63,31 @@ public class CasePriceList extends Case<DefaultPriceList> {
         return toPriceList;
     }
 
-    protected CasePriceList setProduct(DefaultProduct product) {
+    protected CasePriceList setProduct(final DefaultProduct product) {
         this.fromProduct = product;
         return this;
     }
 
-    protected CasePriceList setProductCategory(ProductCategory productCategory) {
+    protected CasePriceList setProductCategory(final ProductCategory productCategory) {
         this.fromProductCategory = productCategory;
         return this;
     }
 
-    protected CasePriceList setBillingPeriod(BillingPeriod billingPeriod) {
+    protected CasePriceList setBillingPeriod(final BillingPeriod billingPeriod) {
         this.fromBillingPeriod = billingPeriod;
         return this;
     }
 
-    protected CasePriceList setPriceList(DefaultPriceList priceList) {
+    protected CasePriceList setPriceList(final DefaultPriceList priceList) {
         this.fromPriceList = priceList;
         return this;
     }
-    
-    
 
 
-	protected CasePriceList setToPriceList(DefaultPriceList toPriceList) {
-		this.toPriceList = toPriceList;
-		return this;
-	}
-	
-	
+    protected CasePriceList setToPriceList(final DefaultPriceList toPriceList) {
+        this.toPriceList = toPriceList;
+        return this;
+    }
+
+
 }

diff --git a/catalog/src/main/java/com/ning/billing/catalog/rules/CaseStandardNaming.java b/catalog/src/main/java/com/ning/billing/catalog/rules/CaseStandardNaming.java
index 8e161ce..e33ef59 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/rules/CaseStandardNaming.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/rules/CaseStandardNaming.java
@@ -16,60 +16,60 @@
 
 package com.ning.billing.catalog.rules;
 
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlIDREF;
+
 import com.ning.billing.catalog.DefaultPriceList;
 import com.ning.billing.catalog.DefaultProduct;
 import com.ning.billing.catalog.api.BillingPeriod;
 import com.ning.billing.catalog.api.ProductCategory;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlIDREF;
-
 public abstract class CaseStandardNaming<T> extends Case<T> {
-    @XmlElement(required=false, name="product")
+    @XmlElement(required = false, name = "product")
     @XmlIDREF
     private DefaultProduct product;
-    @XmlElement(required=false, name="productCategory")
+    @XmlElement(required = false, name = "productCategory")
     private ProductCategory productCategory;
-    
-    @XmlElement(required=false, name="billingPeriod")
+
+    @XmlElement(required = false, name = "billingPeriod")
     private BillingPeriod billingPeriod;
-    
-    @XmlElement(required=false, name="priceList")
+
+    @XmlElement(required = false, name = "priceList")
     @XmlIDREF
     private DefaultPriceList priceList;
 
-	public DefaultProduct getProduct(){
-		return product;
-	}
+    public DefaultProduct getProduct() {
+        return product;
+    }
+
+    public ProductCategory getProductCategory() {
+        return productCategory;
+    }
 
-	public ProductCategory getProductCategory() {
-		return productCategory;
-	}
+    public BillingPeriod getBillingPeriod() {
+        return billingPeriod;
+    }
 
-	public BillingPeriod getBillingPeriod() {
-		return billingPeriod;
-	}
-	
-	public DefaultPriceList getPriceList() {
-		return priceList;
-	}
+    public DefaultPriceList getPriceList() {
+        return priceList;
+    }
 
-    protected CaseStandardNaming<T> setProduct(DefaultProduct product) {
+    protected CaseStandardNaming<T> setProduct(final DefaultProduct product) {
         this.product = product;
         return this;
     }
 
-    protected CaseStandardNaming<T> setProductCategory(ProductCategory productCategory) {
+    protected CaseStandardNaming<T> setProductCategory(final ProductCategory productCategory) {
         this.productCategory = productCategory;
         return this;
     }
 
-    protected CaseStandardNaming<T> setBillingPeriod(BillingPeriod billingPeriod) {
+    protected CaseStandardNaming<T> setBillingPeriod(final BillingPeriod billingPeriod) {
         this.billingPeriod = billingPeriod;
         return this;
     }
 
-    protected CaseStandardNaming<T> setPriceList(DefaultPriceList priceList) {
+    protected CaseStandardNaming<T> setPriceList(final DefaultPriceList priceList) {
         this.priceList = priceList;
         return this;
     }

diff --git a/catalog/src/main/java/com/ning/billing/catalog/rules/PlanRules.java b/catalog/src/main/java/com/ning/billing/catalog/rules/PlanRules.java
index c47529a..f4b1a5e 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/rules/PlanRules.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/rules/PlanRules.java
@@ -21,15 +21,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 
-import org.joda.time.DateTime;
-
 import com.ning.billing.catalog.DefaultPriceList;
 import com.ning.billing.catalog.StandaloneCatalog;
 import com.ning.billing.catalog.api.ActionPolicy;
 import com.ning.billing.catalog.api.BillingAlignment;
 import com.ning.billing.catalog.api.CatalogApiException;
 import com.ning.billing.catalog.api.IllegalPlanChange;
-import com.ning.billing.catalog.api.Plan;
 import com.ning.billing.catalog.api.PlanAlignmentChange;
 import com.ning.billing.catalog.api.PlanAlignmentCreate;
 import com.ning.billing.catalog.api.PlanChangeResult;
@@ -39,134 +36,134 @@ import com.ning.billing.util.config.ValidatingConfig;
 import com.ning.billing.util.config.ValidationErrors;
 
 @XmlAccessorType(XmlAccessType.NONE)
-public class PlanRules extends ValidatingConfig<StandaloneCatalog>  {
-
-	@XmlElementWrapper(name="changePolicy")
-	@XmlElement(name="changePolicyCase", required=false)
-	private CaseChangePlanPolicy[] changeCase;
-	
-	@XmlElementWrapper(name="changeAlignment")
-	@XmlElement(name="changeAlignmentCase", required=false)
-	private CaseChangePlanAlignment[] changeAlignmentCase;
-
-	@XmlElementWrapper(name="cancelPolicy")
-	@XmlElement(name="cancelPolicyCase", required=false)
-	private CaseCancelPolicy[] cancelCase;
-
-	@XmlElementWrapper(name="createAlignment")
-	@XmlElement(name="createAlignmentCase", required=false)
-	private CaseCreateAlignment[] createAlignmentCase;
-	
-	@XmlElementWrapper(name="billingAlignment")
-	@XmlElement(name="billingAlignmentCase", required=false)
-	private CaseBillingAlignment[] billingAlignmentCase;
-
-	@XmlElementWrapper(name="priceList")
-	@XmlElement(name="priceListCase", required=false)
-	private CasePriceList[] priceListCase;
-
-	public PlanAlignmentCreate getPlanCreateAlignment(PlanSpecifier specifier, StandaloneCatalog catalog) throws CatalogApiException {
-		return Case.getResult(createAlignmentCase, specifier, catalog);      
+public class PlanRules extends ValidatingConfig<StandaloneCatalog> {
+
+    @XmlElementWrapper(name = "changePolicy")
+    @XmlElement(name = "changePolicyCase", required = false)
+    private CaseChangePlanPolicy[] changeCase;
+
+    @XmlElementWrapper(name = "changeAlignment")
+    @XmlElement(name = "changeAlignmentCase", required = false)
+    private CaseChangePlanAlignment[] changeAlignmentCase;
+
+    @XmlElementWrapper(name = "cancelPolicy")
+    @XmlElement(name = "cancelPolicyCase", required = false)
+    private CaseCancelPolicy[] cancelCase;
+
+    @XmlElementWrapper(name = "createAlignment")
+    @XmlElement(name = "createAlignmentCase", required = false)
+    private CaseCreateAlignment[] createAlignmentCase;
+
+    @XmlElementWrapper(name = "billingAlignment")
+    @XmlElement(name = "billingAlignmentCase", required = false)
+    private CaseBillingAlignment[] billingAlignmentCase;
+
+    @XmlElementWrapper(name = "priceList")
+    @XmlElement(name = "priceListCase", required = false)
+    private CasePriceList[] priceListCase;
+
+    public PlanAlignmentCreate getPlanCreateAlignment(final PlanSpecifier specifier, final StandaloneCatalog catalog) throws CatalogApiException {
+        return Case.getResult(createAlignmentCase, specifier, catalog);
+    }
+
+    public ActionPolicy getPlanCancelPolicy(final PlanPhaseSpecifier planPhase, final StandaloneCatalog catalog) throws CatalogApiException {
+        return CasePhase.getResult(cancelCase, planPhase, catalog);
+    }
+
+    public BillingAlignment getBillingAlignment(final PlanPhaseSpecifier planPhase, final StandaloneCatalog catalog) throws CatalogApiException {
+        return CasePhase.getResult(billingAlignmentCase, planPhase, catalog);
+    }
+
+    public PlanChangeResult planChange(final PlanPhaseSpecifier from, PlanSpecifier to, final StandaloneCatalog catalog) throws CatalogApiException {
+        final DefaultPriceList toPriceList;
+        if (to.getPriceListName() == null) { // Pricelist may be null because it is unspecified this is the principal use-case
+            toPriceList = findPriceList(from.toPlanSpecifier(), catalog);
+            to = new PlanSpecifier(to.getProductName(), to.getProductCategory(), to.getBillingPeriod(), toPriceList.getName());
+        } else {
+            toPriceList = catalog.findCurrentPriceList(to.getPriceListName());
+        }
+
+        final ActionPolicy policy = getPlanChangePolicy(from, to, catalog);
+        if (policy == ActionPolicy.ILLEGAL) {
+            throw new IllegalPlanChange(from, to);
+        }
+
+        final PlanAlignmentChange alignment = getPlanChangeAlignment(from, to, catalog);
+
+        return new PlanChangeResult(toPriceList, policy, alignment);
+    }
+
+    public PlanAlignmentChange getPlanChangeAlignment(final PlanPhaseSpecifier from,
+                                                      final PlanSpecifier to, final StandaloneCatalog catalog) throws CatalogApiException {
+        return CaseChange.getResult(changeAlignmentCase, from, to, catalog);
+    }
+
+    public ActionPolicy getPlanChangePolicy(final PlanPhaseSpecifier from,
+                                            final PlanSpecifier to, final StandaloneCatalog catalog) throws CatalogApiException {
+        if (from.getProductName().equals(to.getProductName()) &&
+                from.getBillingPeriod() == to.getBillingPeriod() &&
+                from.getPriceListName().equals(to.getPriceListName())) {
+            return ActionPolicy.ILLEGAL;
+        }
+        //Plan toPlan = catalog.findPlan()
+
+        return CaseChange.getResult(changeCase, from, to, catalog);
+    }
+
+    private DefaultPriceList findPriceList(final PlanSpecifier specifier, final StandaloneCatalog catalog) throws CatalogApiException {
+        DefaultPriceList result = Case.getResult(priceListCase, specifier, catalog);
+        if (result == null) {
+            result = catalog.findCurrentPriceList(specifier.getPriceListName());
+        }
+        return result;
+    }
+
+
+    @Override
+    public ValidationErrors validate(final StandaloneCatalog catalog, final ValidationErrors errors) {
+        //TODO: MDW - Validation: check that the plan change special case pairs are unique!
+        //TODO: MDW - Validation: check that the each product appears in at most one tier.
+        //TODO: MDW - Unit tests for rules
+        //TODO: MDW - validate that there is a default policy for change AND cancel
+
+        return errors;
+    }
+
+
+    /////////////////////////////////////////////////////////////////////////////////////
+    // Setters for testing
+    /////////////////////////////////////////////////////////////////////////////////////
+
+    protected PlanRules setChangeCase(final CaseChangePlanPolicy[] changeCase) {
+        this.changeCase = changeCase;
+        return this;
+    }
+
+    protected PlanRules setChangeAlignmentCase(
+            final CaseChangePlanAlignment[] changeAlignmentCase) {
+        this.changeAlignmentCase = changeAlignmentCase;
+        return this;
+    }
+
+    protected PlanRules setCancelCase(final CaseCancelPolicy[] cancelCase) {
+        this.cancelCase = cancelCase;
+        return this;
     }
-	
-	public ActionPolicy getPlanCancelPolicy(PlanPhaseSpecifier planPhase, StandaloneCatalog catalog) throws CatalogApiException {
-		return CasePhase.getResult(cancelCase, planPhase, catalog);      
-	}
-
-	public BillingAlignment getBillingAlignment(PlanPhaseSpecifier planPhase, StandaloneCatalog catalog) throws CatalogApiException {
-		return CasePhase.getResult(billingAlignmentCase, planPhase, catalog);      
-	}
-
-	public PlanChangeResult planChange(PlanPhaseSpecifier from, PlanSpecifier to, StandaloneCatalog catalog) throws CatalogApiException {
-		DefaultPriceList toPriceList;
-		if( to.getPriceListName() == null ) { // Pricelist may be null because it is unspecified this is the principal use-case
-			toPriceList = findPriceList(from.toPlanSpecifier(), catalog);
-			to = new PlanSpecifier(to.getProductName(), to.getProductCategory(), to.getBillingPeriod(), toPriceList.getName());
-		} else {
-			toPriceList = catalog.findCurrentPriceList(to.getPriceListName());
-		}
-		
-		ActionPolicy policy = getPlanChangePolicy(from, to, catalog);
-		if(policy == ActionPolicy.ILLEGAL) {
-			throw new IllegalPlanChange(from, to);
-		}
-		
-		PlanAlignmentChange alignment = getPlanChangeAlignment(from, to, catalog);
-		
-		return new PlanChangeResult(toPriceList, policy, alignment);
-	}
-	
-	public PlanAlignmentChange getPlanChangeAlignment(PlanPhaseSpecifier from,
-			PlanSpecifier to, StandaloneCatalog catalog) throws CatalogApiException {
-		return CaseChange.getResult(changeAlignmentCase, from, to, catalog);      
+
+    protected PlanRules setCreateAlignmentCase(final CaseCreateAlignment[] createAlignmentCase) {
+        this.createAlignmentCase = createAlignmentCase;
+        return this;
     }
 
-	public ActionPolicy getPlanChangePolicy(PlanPhaseSpecifier from,
-			PlanSpecifier to, StandaloneCatalog catalog) throws CatalogApiException {
-		if(from.getProductName().equals(to.getProductName()) &&
-				from.getBillingPeriod() == to.getBillingPeriod() &&
-				from.getPriceListName().equals(to.getPriceListName())) {
-			return ActionPolicy.ILLEGAL;
-		}
-		//Plan toPlan = catalog.findPlan()
-		
-		return CaseChange.getResult(changeCase, from, to, catalog); 
-	}
-	
-	private DefaultPriceList findPriceList(PlanSpecifier specifier, StandaloneCatalog catalog) throws CatalogApiException {
-		DefaultPriceList result = Case.getResult(priceListCase, specifier, catalog);
-		if (result == null) {
-			result = catalog.findCurrentPriceList(specifier.getPriceListName());
-		}
-		return result;
-	}
-	
-	
-	@Override
-	public ValidationErrors validate(StandaloneCatalog catalog, ValidationErrors errors) {
-	    //TODO: MDW - Validation: check that the plan change special case pairs are unique!
-	    //TODO: MDW - Validation: check that the each product appears in at most one tier.
-		//TODO: MDW - Unit tests for rules
-		//TODO: MDW - validate that there is a default policy for change AND cancel
-
-		return errors;
-	}
-
-	
-	/////////////////////////////////////////////////////////////////////////////////////
-	// Setters for testing
-	/////////////////////////////////////////////////////////////////////////////////////
-	
-	protected PlanRules setChangeCase(CaseChangePlanPolicy[] changeCase) {
-		this.changeCase = changeCase;
-		return this;
-	}
-
-	protected PlanRules setChangeAlignmentCase(
-			CaseChangePlanAlignment[] changeAlignmentCase) {
-		this.changeAlignmentCase = changeAlignmentCase;
-		return this;
-	}
-
-	protected PlanRules setCancelCase(CaseCancelPolicy[] cancelCase) {
-		this.cancelCase = cancelCase;
-		return this;
-	}
-
-	protected PlanRules setCreateAlignmentCase(CaseCreateAlignment[] createAlignmentCase) {
-		this.createAlignmentCase = createAlignmentCase;
-		return this;
-	}
-
-	protected PlanRules setBillingAlignmentCase(
-			CaseBillingAlignment[] billingAlignmentCase) {
-		this.billingAlignmentCase = billingAlignmentCase;
-		return this;
-	}
-
-	protected PlanRules setPriceListCase(CasePriceList[] priceListCase) {
-		this.priceListCase = priceListCase;
-		return this;
-	}
+    protected PlanRules setBillingAlignmentCase(
+            final CaseBillingAlignment[] billingAlignmentCase) {
+        this.billingAlignmentCase = billingAlignmentCase;
+        return this;
+    }
+
+    protected PlanRules setPriceListCase(final CasePriceList[] priceListCase) {
+        this.priceListCase = priceListCase;
+        return this;
+    }
 
 }

diff --git a/catalog/src/main/java/com/ning/billing/catalog/StandaloneCatalog.java b/catalog/src/main/java/com/ning/billing/catalog/StandaloneCatalog.java
index 32324f9..22c091b 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/StandaloneCatalog.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/StandaloneCatalog.java
@@ -16,17 +16,16 @@
 
 package com.ning.billing.catalog;
 
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
 
 import com.ning.billing.ErrorCode;
 import com.ning.billing.catalog.api.ActionPolicy;
@@ -50,288 +49,287 @@ import com.ning.billing.util.config.ValidatingConfig;
 import com.ning.billing.util.config.ValidationError;
 import com.ning.billing.util.config.ValidationErrors;
 
-@XmlRootElement(name="catalog")
+@XmlRootElement(name = "catalog")
 @XmlAccessorType(XmlAccessType.NONE)
 public class StandaloneCatalog extends ValidatingConfig<StandaloneCatalog> implements StaticCatalog {
-	@XmlElement(required=true)
-	private Date effectiveDate;
+    @XmlElement(required = true)
+    private Date effectiveDate;
 
-	@XmlElement(required=true)
-	private String catalogName;
+    @XmlElement(required = true)
+    private String catalogName;
 
-	private URI catalogURI;
+    private URI catalogURI;
 
-	@XmlElementWrapper(name="currencies", required=true)
-	@XmlElement(name="currency", required=true)
-	private Currency[] supportedCurrencies;
+    @XmlElementWrapper(name = "currencies", required = true)
+    @XmlElement(name = "currency", required = true)
+    private Currency[] supportedCurrencies;
 
-	@XmlElementWrapper(name="products", required=true)
-	@XmlElement(name="product", required=true)
-	private DefaultProduct[] products;
+    @XmlElementWrapper(name = "products", required = true)
+    @XmlElement(name = "product", required = true)
+    private DefaultProduct[] products;
 
-	@XmlElement(name="rules", required=true)
-	private PlanRules planRules;
+    @XmlElement(name = "rules", required = true)
+    private PlanRules planRules;
 
-	@XmlElementWrapper(name="plans", required=true)
-	@XmlElement(name="plan", required=true) 
-	private DefaultPlan[] plans;
+    @XmlElementWrapper(name = "plans", required = true)
+    @XmlElement(name = "plan", required = true)
+    private DefaultPlan[] plans;
 
-    @XmlElement(name="priceLists", required=true)
+    @XmlElement(name = "priceLists", required = true)
     private DefaultPriceListSet priceLists;
 
-	public StandaloneCatalog() {}
-
-	protected StandaloneCatalog (Date effectiveDate) {
-		this.effectiveDate = effectiveDate;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ning.billing.catalog.ICatalog#getCalalogName()
-	 */
-	@Override
-	public String getCatalogName() {
-		return catalogName;
-	}
-
-	@Override
-	public Date getEffectiveDate() {
-		return effectiveDate;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ning.billing.catalog.ICatalog#getProducts()
-	 */
-	@Override
-	public DefaultProduct[] getCurrentProducts() {
-		return products;
-	}
-
-
-	@Override
-	public Currency[] getCurrentSupportedCurrencies() {
-		return supportedCurrencies;
-	}
-
-	@Override
-	public DefaultPlan[] getCurrentPlans() {
-		return plans;
-	}
-
-	public URI getCatalogURI() {
-		return catalogURI;
-	}
-
-	public PlanRules getPlanRules() { 
-		return planRules;
-	}
-	
-	public DefaultPriceList findCurrentPriceList(String priceListName) throws CatalogApiException {
-		return priceLists.findPriceListFrom(priceListName);
-	}
-	
-	public DefaultPriceListSet getPriceLists() {
-		return this.priceLists;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ning.billing.catalog.ICatalog#getPlan(java.lang.String, java.lang.String)
-	 */
-	@Override
-	public DefaultPlan findCurrentPlan(String productName, BillingPeriod period, String priceListName) throws CatalogApiException {
-		if (productName == null ) {
-			throw new CatalogApiException(ErrorCode.CAT_NULL_PRODUCT_NAME);
-		}
-		if (priceLists == null) {
-			throw new CatalogApiException(ErrorCode.CAT_PRICE_LIST_NOT_FOUND,priceListName);
-		}
-		Product product = findCurrentProduct(productName);
-		DefaultPlan result = priceLists.getPlanFrom(priceListName, product, period);
-		if ( result == null) {
-			String periodString = (period == null) ? "NULL" :  period.toString();
-			throw new CatalogApiException(ErrorCode.CAT_PLAN_NOT_FOUND, productName, periodString, priceListName);
-		}
-		return result;
-	}
-	
-	@Override
-	public DefaultPlan findCurrentPlan(String name) throws CatalogApiException {
-		if (name == null || plans == null) {
-			throw new CatalogApiException(ErrorCode.CAT_NO_SUCH_PLAN, name);
-		}
-		for(DefaultPlan p : plans) {
-			if(p.getName().equals(name)) {
-				return p;
-			}
-		}
-		throw new CatalogApiException(ErrorCode.CAT_NO_SUCH_PLAN, name);
-	}
-	
-	@Override
-	public Product findCurrentProduct(String name) throws CatalogApiException {
-		if (name == null || products == null) {
-			throw new CatalogApiException(ErrorCode.CAT_NO_SUCH_PRODUCT, name);
-		}
-		for(DefaultProduct p : products) {
-			if (p.getName().equals(name)) {
-				return p;
-			}
-		}
-		throw new CatalogApiException(ErrorCode.CAT_NO_SUCH_PRODUCT, name);
-	}
-
-	@Override
-	public PlanPhase findCurrentPhase(String name) throws CatalogApiException {
-		if (name == null || plans == null) {
-			throw new CatalogApiException(ErrorCode.CAT_NO_SUCH_PHASE, name);
-		}
-		
-		String  planName = DefaultPlanPhase.planName(name);
-		Plan plan = findCurrentPlan(planName);
-		return plan.findPhase(name);
-	}
+    public StandaloneCatalog() {
+    }
+
+    protected StandaloneCatalog(final Date effectiveDate) {
+        this.effectiveDate = effectiveDate;
+    }
+
+    /* (non-Javadoc)
+      * @see com.ning.billing.catalog.ICatalog#getCalalogName()
+      */
+    @Override
+    public String getCatalogName() {
+        return catalogName;
+    }
+
+    @Override
+    public Date getEffectiveDate() {
+        return effectiveDate;
+    }
+
+    /* (non-Javadoc)
+      * @see com.ning.billing.catalog.ICatalog#getProducts()
+      */
+    @Override
+    public DefaultProduct[] getCurrentProducts() {
+        return products;
+    }
+
+
+    @Override
+    public Currency[] getCurrentSupportedCurrencies() {
+        return supportedCurrencies;
+    }
+
+    @Override
+    public DefaultPlan[] getCurrentPlans() {
+        return plans;
+    }
+
+    public URI getCatalogURI() {
+        return catalogURI;
+    }
+
+    public PlanRules getPlanRules() {
+        return planRules;
+    }
+
+    public DefaultPriceList findCurrentPriceList(final String priceListName) throws CatalogApiException {
+        return priceLists.findPriceListFrom(priceListName);
+    }
+
+    public DefaultPriceListSet getPriceLists() {
+        return this.priceLists;
+    }
+
+    /* (non-Javadoc)
+      * @see com.ning.billing.catalog.ICatalog#getPlan(java.lang.String, java.lang.String)
+      */
+    @Override
+    public DefaultPlan findCurrentPlan(final String productName, final BillingPeriod period, final String priceListName) throws CatalogApiException {
+        if (productName == null) {
+            throw new CatalogApiException(ErrorCode.CAT_NULL_PRODUCT_NAME);
+        }
+        if (priceLists == null) {
+            throw new CatalogApiException(ErrorCode.CAT_PRICE_LIST_NOT_FOUND, priceListName);
+        }
+        final Product product = findCurrentProduct(productName);
+        final DefaultPlan result = priceLists.getPlanFrom(priceListName, product, period);
+        if (result == null) {
+            final String periodString = (period == null) ? "NULL" : period.toString();
+            throw new CatalogApiException(ErrorCode.CAT_PLAN_NOT_FOUND, productName, periodString, priceListName);
+        }
+        return result;
+    }
+
+    @Override
+    public DefaultPlan findCurrentPlan(final String name) throws CatalogApiException {
+        if (name == null || plans == null) {
+            throw new CatalogApiException(ErrorCode.CAT_NO_SUCH_PLAN, name);
+        }
+        for (final DefaultPlan p : plans) {
+            if (p.getName().equals(name)) {
+                return p;
+            }
+        }
+        throw new CatalogApiException(ErrorCode.CAT_NO_SUCH_PLAN, name);
+    }
+
+    @Override
+    public Product findCurrentProduct(final String name) throws CatalogApiException {
+        if (name == null || products == null) {
+            throw new CatalogApiException(ErrorCode.CAT_NO_SUCH_PRODUCT, name);
+        }
+        for (final DefaultProduct p : products) {
+            if (p.getName().equals(name)) {
+                return p;
+            }
+        }
+        throw new CatalogApiException(ErrorCode.CAT_NO_SUCH_PRODUCT, name);
+    }
+
+    @Override
+    public PlanPhase findCurrentPhase(final String name) throws CatalogApiException {
+        if (name == null || plans == null) {
+            throw new CatalogApiException(ErrorCode.CAT_NO_SUCH_PHASE, name);
+        }
+
+        final String planName = DefaultPlanPhase.planName(name);
+        final Plan plan = findCurrentPlan(planName);
+        return plan.findPhase(name);
+    }
 
     @Override
-    public PriceList findCurrentPricelist(String name)
+    public PriceList findCurrentPricelist(final String name)
             throws CatalogApiException {
         if (name == null || priceLists == null) {
             throw new CatalogApiException(ErrorCode.CAT_PRICE_LIST_NOT_FOUND, name);
         }
-        
+
         return priceLists.findPriceListFrom(name);
     }
 
 
+    //////////////////////////////////////////////////////////////////////////////
+    //
+    // RULES
+    //
+    //////////////////////////////////////////////////////////////////////////////
+    @Override
+    public ActionPolicy planChangePolicy(final PlanPhaseSpecifier from, final PlanSpecifier to) throws CatalogApiException {
+        return planRules.getPlanChangePolicy(from, to, this);
+    }
+
+    @Override
+    public PlanAlignmentChange planChangeAlignment(final PlanPhaseSpecifier from, final PlanSpecifier to) throws CatalogApiException {
+        return planRules.getPlanChangeAlignment(from, to, this);
+    }
+
+    @Override
+    public ActionPolicy planCancelPolicy(final PlanPhaseSpecifier planPhase) throws CatalogApiException {
+        return planRules.getPlanCancelPolicy(planPhase, this);
+    }
+
+    @Override
+    public PlanAlignmentCreate planCreateAlignment(final PlanSpecifier specifier) throws CatalogApiException {
+        return planRules.getPlanCreateAlignment(specifier, this);
+    }
+
+    @Override
+    public BillingAlignment billingAlignment(final PlanPhaseSpecifier planPhase) throws CatalogApiException {
+        return planRules.getBillingAlignment(planPhase, this);
+    }
+
+    @Override
+    public PlanChangeResult planChange(final PlanPhaseSpecifier from, final PlanSpecifier to)
+            throws CatalogApiException {
+        return planRules.planChange(from, to, this);
+    }
+
+    @Override
+    public ValidationErrors validate(final StandaloneCatalog catalog, final ValidationErrors errors) {
+        validate(catalog, errors, products);
+        validate(catalog, errors, plans);
+        priceLists.validate(catalog, errors);
+        planRules.validate(catalog, errors);
+        return errors;
+    }
+
+    private Collection<? extends ValidationError> validate(final StandaloneCatalog catalog,
+                                                           final ValidationErrors errors, final ValidatingConfig<StandaloneCatalog>[] configs) {
+        for (final ValidatingConfig<StandaloneCatalog> config : configs) {
+            config.validate(catalog, errors);
+        }
+        return errors;
+    }
 
-	//////////////////////////////////////////////////////////////////////////////
-	//
-	// RULES
-	//
-	//////////////////////////////////////////////////////////////////////////////
-	@Override
-	public ActionPolicy planChangePolicy(PlanPhaseSpecifier from, PlanSpecifier to) throws CatalogApiException {
-		return planRules.getPlanChangePolicy(from, to, this);
-	}
-
-	@Override
-	public PlanAlignmentChange planChangeAlignment(PlanPhaseSpecifier from, PlanSpecifier to) throws CatalogApiException {
-		return planRules.getPlanChangeAlignment(from, to, this);
-	}
-
-	@Override
-	public ActionPolicy planCancelPolicy(PlanPhaseSpecifier planPhase) throws CatalogApiException {
-		return planRules.getPlanCancelPolicy(planPhase, this);
-	}
-
-	@Override
-	public PlanAlignmentCreate planCreateAlignment(PlanSpecifier specifier) throws CatalogApiException {
-		return planRules.getPlanCreateAlignment(specifier, this);
-	}
-
-	@Override
-	public BillingAlignment billingAlignment(PlanPhaseSpecifier planPhase) throws CatalogApiException {
-		return planRules.getBillingAlignment(planPhase, this);
-	}
-
-	@Override
-	public PlanChangeResult planChange(PlanPhaseSpecifier from, PlanSpecifier to)
-			throws CatalogApiException {
-		return planRules.planChange(from, to, this);
-	}
-
-	@Override
-	public ValidationErrors validate(StandaloneCatalog catalog, ValidationErrors errors) {
-		validate(catalog,errors, products);
-		validate(catalog,errors, plans);
-		priceLists.validate(catalog,errors);
-		planRules.validate(catalog, errors);
-		return errors;
-	}
-
-	private Collection<? extends ValidationError> validate(StandaloneCatalog catalog,
-			ValidationErrors errors, ValidatingConfig<StandaloneCatalog>[] configs) {
-		for(ValidatingConfig<StandaloneCatalog> config: configs) {
-			config.validate(catalog, errors);
-		}
-		return errors;
-	}
-	
-
-	@Override
-	public void initialize(StandaloneCatalog catalog, URI sourceURI) {
-		catalogURI = sourceURI;
-		super.initialize(catalog, sourceURI);
-		planRules.initialize(catalog, sourceURI);
-		priceLists.initialize(catalog, sourceURI);
-		for(DefaultProduct p : products) {
-			p.initialize(catalog, sourceURI);
-		}
-		for(DefaultPlan p : plans) {
-			p.initialize(catalog, sourceURI);
-		}
-		
-	}
-
-
-	protected StandaloneCatalog setProducts(DefaultProduct[] products) {
-		this.products = products;
-		return this;
-	}
-	protected StandaloneCatalog setSupportedCurrencies(Currency[] supportedCurrencies) {
-		this.supportedCurrencies = supportedCurrencies;
-		return this;
-	}
-
-	protected StandaloneCatalog setPlanChangeRules(PlanRules planChangeRules) {
-		this.planRules = planChangeRules;
-		return this;
-	}
-
-	protected StandaloneCatalog setPlans(DefaultPlan[] plans) {
-		this.plans = plans;
-		return this;
-	}
-
-	protected StandaloneCatalog setEffectiveDate(Date effectiveDate) {
-		this.effectiveDate = effectiveDate;
-		return this;
-	}
-
-	protected StandaloneCatalog setPlanRules(PlanRules planRules) {
-		this.planRules = planRules;
-		return this;
-	}
-
-    protected StandaloneCatalog setPriceLists(DefaultPriceListSet priceLists) {
+
+    @Override
+    public void initialize(final StandaloneCatalog catalog, final URI sourceURI) {
+        catalogURI = sourceURI;
+        super.initialize(catalog, sourceURI);
+        planRules.initialize(catalog, sourceURI);
+        priceLists.initialize(catalog, sourceURI);
+        for (final DefaultProduct p : products) {
+            p.initialize(catalog, sourceURI);
+        }
+        for (final DefaultPlan p : plans) {
+            p.initialize(catalog, sourceURI);
+        }
+
+    }
+
+
+    protected StandaloneCatalog setProducts(final DefaultProduct[] products) {
+        this.products = products;
+        return this;
+    }
+
+    protected StandaloneCatalog setSupportedCurrencies(final Currency[] supportedCurrencies) {
+        this.supportedCurrencies = supportedCurrencies;
+        return this;
+    }
+
+    protected StandaloneCatalog setPlanChangeRules(final PlanRules planChangeRules) {
+        this.planRules = planChangeRules;
+        return this;
+    }
+
+    protected StandaloneCatalog setPlans(final DefaultPlan[] plans) {
+        this.plans = plans;
+        return this;
+    }
+
+    protected StandaloneCatalog setEffectiveDate(final Date effectiveDate) {
+        this.effectiveDate = effectiveDate;
+        return this;
+    }
+
+    protected StandaloneCatalog setPlanRules(final PlanRules planRules) {
+        this.planRules = planRules;
+        return this;
+    }
+
+    protected StandaloneCatalog setPriceLists(final DefaultPriceListSet priceLists) {
         this.priceLists = priceLists;
         return this;
     }
 
     @Override
-    public boolean canCreatePlan(PlanSpecifier specifier) throws CatalogApiException {
-        Product product = findCurrentProduct(specifier.getProductName());
-        Plan plan = findCurrentPlan(specifier.getProductName(), specifier.getBillingPeriod(), specifier.getPriceListName());
-        DefaultPriceList priceList = findCurrentPriceList(specifier.getPriceListName());
-        
+    public boolean canCreatePlan(final PlanSpecifier specifier) throws CatalogApiException {
+        final Product product = findCurrentProduct(specifier.getProductName());
+        final Plan plan = findCurrentPlan(specifier.getProductName(), specifier.getBillingPeriod(), specifier.getPriceListName());
+        final DefaultPriceList priceList = findCurrentPriceList(specifier.getPriceListName());
+
         return (!product.isRetired()) &&
                 (!plan.isRetired()) &&
                 (!priceList.isRetired());
     }
 
     @Override
-    public List<Listing> getAvailableAddonListings(String baseProductName) {
-        List<Listing> availAddons = new ArrayList<Listing>();
+    public List<Listing> getAvailableAddonListings(final String baseProductName) {
+        final List<Listing> availAddons = new ArrayList<Listing>();
 
         try {
             Product product = findCurrentProduct(baseProductName);
             if ( product != null ) {
                 for ( Product availAddon : product.getAvailable() ) {
-                    for ( Plan plan : getCurrentPlans()) {
-                        if( plan.getProduct().equals(availAddon)) {
-                            for( PriceList priceList : getPriceLists().getAllPriceLists()) {
-                                if ( priceList.findPlan(availAddon, plan.getBillingPeriod()) != null &&
-                                     priceList.findPlan(product, plan.getBillingPeriod()).equals(plan)) {
-                                    availAddons.add(new DefaultListing(plan, priceList));
-                                }
+                    for ( BillingPeriod billingPeriod : BillingPeriod.values()) {
+                        for( PriceList priceList : getPriceLists().getAllPriceLists()) {
+                            Plan addonInList = priceList.findPlan(availAddon, billingPeriod);
+                            if ( (addonInList != null) ) {
+                                availAddons.add(new DefaultListing(addonInList, priceList));
                             }
                         }
                     }
@@ -341,6 +339,7 @@ public class StandaloneCatalog extends ValidatingConfig<StandaloneCatalog> imple
             // No such product - just return an empty list
         }
 
-        return availAddons;    }
+        return availAddons;
+    }
 
 }

diff --git a/catalog/src/main/java/com/ning/billing/catalog/VersionedCatalog.java b/catalog/src/main/java/com/ning/billing/catalog/VersionedCatalog.java
index 3bd370a..5050a17 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/VersionedCatalog.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/VersionedCatalog.java
@@ -15,6 +15,10 @@
  */
 package com.ning.billing.catalog;
 
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -23,11 +27,6 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
 import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -55,399 +54,397 @@ import com.ning.billing.util.config.ValidatingConfig;
 import com.ning.billing.util.config.ValidationErrors;
 
 
-@XmlRootElement(name="catalog")
+@XmlRootElement(name = "catalog")
 @XmlAccessorType(XmlAccessType.NONE)
 public class VersionedCatalog extends ValidatingConfig<StandaloneCatalog> implements Catalog, StaticCatalog {
-	private static final Logger log = LoggerFactory.getLogger(VersionedCatalog.class);
-	
-	final private Clock clock;
-	private String catalogName;
-	
-	@XmlElement(name="catalogVersion", required=true)
-	private final List<StandaloneCatalog> versions = new ArrayList<StandaloneCatalog>();
-
-	public VersionedCatalog(Clock clock) {
-		this.clock = clock;
-	}
-
-	//
-	// Private methods
-	//
-	private StandaloneCatalog versionForDate(DateTime date) throws CatalogApiException {
-		return versions.get(indexOfVersionForDate(date.toDate()));
-	}
-
-	private List<StandaloneCatalog> versionsBeforeDate(Date date) throws CatalogApiException {
-		List<StandaloneCatalog> result = new ArrayList<StandaloneCatalog>();
-		int index = indexOfVersionForDate(date);
-		for(int i = 0; i <= index; i++) {
-			result.add(versions.get(i));
-		}
-		return result;
-	}
-
-	private int indexOfVersionForDate(Date date) throws CatalogApiException {
-		for(int i = versions.size() - 1; i >= 0; i--) {
-			StandaloneCatalog c = versions.get(i);
-			if(c.getEffectiveDate().getTime() < date.getTime()) {
-				return i;
-			}
-		}
-		throw new CatalogApiException(ErrorCode.CAT_NO_CATALOG_FOR_GIVEN_DATE, date.toString());
-	}
-	
-	private class PlanRequestWrapper {
-		String name;
-		String productName;
-		BillingPeriod bp;
-		String priceListName;
-		
-		public PlanRequestWrapper(String name) {
-			super();
-			this.name = name;
-		}
-
-		public PlanRequestWrapper(String productName, BillingPeriod bp,
-				String priceListName) {
-			super();
-			this.productName = productName;
-			this.bp = bp;
-			this.priceListName = priceListName;
-		}
-		
-		public Plan findPlan(StandaloneCatalog catalog) throws CatalogApiException {
-			if(name != null) {
-				return catalog.findCurrentPlan(name);
-			} else {
-				return catalog.findCurrentPlan(productName, bp, priceListName);
-			}
-		}
-	}
-	
-	private Plan findPlan(PlanRequestWrapper wrapper, 
-			DateTime requestedDate,
-			DateTime subscriptionStartDate) 
-					throws CatalogApiException {
-		List<StandaloneCatalog> catalogs = versionsBeforeDate(requestedDate.toDate());
-		if(catalogs.size() == 0) {
-			throw new CatalogApiException(ErrorCode.CAT_NO_CATALOG_FOR_GIVEN_DATE, requestedDate.toDate().toString());
-		}
-		
-		for(int i = catalogs.size() - 1; i >= 0 ; i--) { // Working backwards to find the latest applicable plan
-			StandaloneCatalog c = catalogs.get(i);
-			Plan plan = null;
-			try {
-				 plan = wrapper.findPlan(c);
-			} catch (CatalogApiException e) {
-				if(e.getCode() != ErrorCode.CAT_NO_SUCH_PLAN.getCode()) {
-					throw e;
-				} else { 
-					break;
-				}
-			}
-				
-			DateTime catalogEffectiveDate = new DateTime(c.getEffectiveDate());
-			if(subscriptionStartDate.isAfter(catalogEffectiveDate)) { // Its a new subscription this plan always applies
-				return plan;
-			} else { //Its an existing subscription
-				if(plan.getEffectiveDateForExistingSubscriptons() != null) { //if it is null any change to this does not apply to existing subscriptions
-					DateTime existingSubscriptionDate = new DateTime(plan.getEffectiveDateForExistingSubscriptons());
-					if(requestedDate.isAfter(existingSubscriptionDate)){ // this plan is now applicable to existing subs
-						return plan;
-					}
-				}
-			}
-		}
-		
-		throw new CatalogApiException(ErrorCode.CAT_NO_CATALOG_FOR_GIVEN_DATE, requestedDate.toDate().toString());
-	}
-	
-	
-	
-	//
-	// Public methods not exposed in interface
-	//
-	public void add(StandaloneCatalog e) throws CatalogApiException {
-		if(catalogName == null) {
-			catalogName = e.getCatalogName();
-		} else {
-			if(!catalogName.equals(getCatalogName())) {
-				throw new CatalogApiException(ErrorCode.CAT_CATALOG_NAME_MISMATCH,catalogName, e.getCatalogName());
-			}
-		}
-		versions.add(e);
-		Collections.sort(versions,new Comparator<StandaloneCatalog>() {
-			@Override
-			public int compare(StandaloneCatalog c1, StandaloneCatalog c2) {
-				return c1.getEffectiveDate().compareTo(c2.getEffectiveDate());
-			}
-		});
-	}
-		
-	public Iterator<StandaloneCatalog> iterator() {
-		return versions.iterator();
-	}
-
-	public int size() {
-		return versions.size();
-	}
-
-	//
+    private static final Logger log = LoggerFactory.getLogger(VersionedCatalog.class);
+
+    private final Clock clock;
+    private String catalogName;
+
+    @XmlElement(name = "catalogVersion", required = true)
+    private final List<StandaloneCatalog> versions = new ArrayList<StandaloneCatalog>();
+
+    public VersionedCatalog(final Clock clock) {
+        this.clock = clock;
+    }
+
+    //
+    // Private methods
+    //
+    private StandaloneCatalog versionForDate(final DateTime date) throws CatalogApiException {
+        return versions.get(indexOfVersionForDate(date.toDate()));
+    }
+
+    private List<StandaloneCatalog> versionsBeforeDate(final Date date) throws CatalogApiException {
+        final List<StandaloneCatalog> result = new ArrayList<StandaloneCatalog>();
+        final int index = indexOfVersionForDate(date);
+        for (int i = 0; i <= index; i++) {
+            result.add(versions.get(i));
+        }
+        return result;
+    }
+
+    private int indexOfVersionForDate(final Date date) throws CatalogApiException {
+        for (int i = versions.size() - 1; i >= 0; i--) {
+            final StandaloneCatalog c = versions.get(i);
+            if (c.getEffectiveDate().getTime() < date.getTime()) {
+                return i;
+            }
+        }
+        throw new CatalogApiException(ErrorCode.CAT_NO_CATALOG_FOR_GIVEN_DATE, date.toString());
+    }
+
+    private class PlanRequestWrapper {
+        String name;
+        String productName;
+        BillingPeriod bp;
+        String priceListName;
+
+        public PlanRequestWrapper(final String name) {
+            super();
+            this.name = name;
+        }
+
+        public PlanRequestWrapper(final String productName, final BillingPeriod bp,
+                                  final String priceListName) {
+            super();
+            this.productName = productName;
+            this.bp = bp;
+            this.priceListName = priceListName;
+        }
+
+        public Plan findPlan(final StandaloneCatalog catalog) throws CatalogApiException {
+            if (name != null) {
+                return catalog.findCurrentPlan(name);
+            } else {
+                return catalog.findCurrentPlan(productName, bp, priceListName);
+            }
+        }
+    }
+
+    private Plan findPlan(final PlanRequestWrapper wrapper,
+                          final DateTime requestedDate,
+                          final DateTime subscriptionStartDate)
+            throws CatalogApiException {
+        final List<StandaloneCatalog> catalogs = versionsBeforeDate(requestedDate.toDate());
+        if (catalogs.size() == 0) {
+            throw new CatalogApiException(ErrorCode.CAT_NO_CATALOG_FOR_GIVEN_DATE, requestedDate.toDate().toString());
+        }
+
+        for (int i = catalogs.size() - 1; i >= 0; i--) { // Working backwards to find the latest applicable plan
+            final StandaloneCatalog c = catalogs.get(i);
+            Plan plan = null;
+            try {
+                plan = wrapper.findPlan(c);
+            } catch (CatalogApiException e) {
+                if (e.getCode() != ErrorCode.CAT_NO_SUCH_PLAN.getCode()) {
+                    throw e;
+                } else {
+                    break;
+                }
+            }
+
+            final DateTime catalogEffectiveDate = new DateTime(c.getEffectiveDate());
+            if (subscriptionStartDate.isAfter(catalogEffectiveDate)) { // Its a new subscription this plan always applies
+                return plan;
+            } else { //Its an existing subscription
+                if (plan.getEffectiveDateForExistingSubscriptons() != null) { //if it is null any change to this does not apply to existing subscriptions
+                    final DateTime existingSubscriptionDate = new DateTime(plan.getEffectiveDateForExistingSubscriptons());
+                    if (requestedDate.isAfter(existingSubscriptionDate)) { // this plan is now applicable to existing subs
+                        return plan;
+                    }
+                }
+            }
+        }
+
+        throw new CatalogApiException(ErrorCode.CAT_NO_CATALOG_FOR_GIVEN_DATE, requestedDate.toDate().toString());
+    }
+
+
+    //
+    // Public methods not exposed in interface
+    //
+    public void add(final StandaloneCatalog e) throws CatalogApiException {
+        if (catalogName == null) {
+            catalogName = e.getCatalogName();
+        } else {
+            if (!catalogName.equals(getCatalogName())) {
+                throw new CatalogApiException(ErrorCode.CAT_CATALOG_NAME_MISMATCH, catalogName, e.getCatalogName());
+            }
+        }
+        versions.add(e);
+        Collections.sort(versions, new Comparator<StandaloneCatalog>() {
+            @Override
+            public int compare(final StandaloneCatalog c1, final StandaloneCatalog c2) {
+                return c1.getEffectiveDate().compareTo(c2.getEffectiveDate());
+            }
+        });
+    }
+
+    public Iterator<StandaloneCatalog> iterator() {
+        return versions.iterator();
+    }
+
+    public int size() {
+        return versions.size();
+    }
+
+    //
     // Simple getters
     //
-	@Override
-	public String getCatalogName() {
-		return catalogName;
-	}
-
-	@Override
-	public DefaultProduct[] getProducts(DateTime requestedDate) throws CatalogApiException {
-		return versionForDate(requestedDate).getCurrentProducts();
-	}
-
-	@Override
-	public Currency[] getSupportedCurrencies(DateTime requestedDate) throws CatalogApiException {
-		return versionForDate(requestedDate).getCurrentSupportedCurrencies();
-	}
-
-	@Override
-	public DefaultPlan[] getPlans(DateTime requestedDate) throws CatalogApiException {
-		return versionForDate(requestedDate).getCurrentPlans();
-	}
-
-	//
-	// Find a plan
-	//
-	@Override
-	public Plan findPlan(String name, 
-			DateTime requestedDate) 
-					throws CatalogApiException {
-		return versionForDate(requestedDate).findCurrentPlan(name);
-	}
-
-	@Override
-	public Plan findPlan(String productName, 
-			BillingPeriod term,
-			String priceListName,
-			DateTime requestedDate) 
-					throws CatalogApiException {
-		return versionForDate(requestedDate).findCurrentPlan(productName, term, priceListName);
-	}
-
-	@Override
-	public Plan findPlan(String name, 
-			DateTime requestedDate,
-			DateTime subscriptionStartDate) 
-					throws CatalogApiException {
-		return findPlan(new PlanRequestWrapper(name), requestedDate, subscriptionStartDate);
-	}
-
-	@Override
-	public Plan findPlan(String productName, 
-			BillingPeriod term,
-			String priceListName,
-			DateTime requestedDate,
-			DateTime subscriptionStartDate) 
-					throws CatalogApiException {
-		return findPlan(new PlanRequestWrapper(productName, term, priceListName), requestedDate, subscriptionStartDate);
-	}
-
-	//
-	// Find a product
-	//
-	@Override
-	public Product findProduct(String name, DateTime requestedDate) throws CatalogApiException {
-		return versionForDate(requestedDate).findCurrentProduct(name);
-	}
+    @Override
+    public String getCatalogName() {
+        return catalogName;
+    }
+
+    @Override
+    public DefaultProduct[] getProducts(final DateTime requestedDate) throws CatalogApiException {
+        return versionForDate(requestedDate).getCurrentProducts();
+    }
+
+    @Override
+    public Currency[] getSupportedCurrencies(final DateTime requestedDate) throws CatalogApiException {
+        return versionForDate(requestedDate).getCurrentSupportedCurrencies();
+    }
+
+    @Override
+    public DefaultPlan[] getPlans(final DateTime requestedDate) throws CatalogApiException {
+        return versionForDate(requestedDate).getCurrentPlans();
+    }
+
+    //
+    // Find a plan
+    //
+    @Override
+    public Plan findPlan(final String name,
+                         final DateTime requestedDate)
+            throws CatalogApiException {
+        return versionForDate(requestedDate).findCurrentPlan(name);
+    }
+
+    @Override
+    public Plan findPlan(final String productName,
+                         final BillingPeriod term,
+                         final String priceListName,
+                         final DateTime requestedDate)
+            throws CatalogApiException {
+        return versionForDate(requestedDate).findCurrentPlan(productName, term, priceListName);
+    }
+
+    @Override
+    public Plan findPlan(final String name,
+                         final DateTime requestedDate,
+                         final DateTime subscriptionStartDate)
+            throws CatalogApiException {
+        return findPlan(new PlanRequestWrapper(name), requestedDate, subscriptionStartDate);
+    }
+
+    @Override
+    public Plan findPlan(final String productName,
+                         final BillingPeriod term,
+                         final String priceListName,
+                         final DateTime requestedDate,
+                         final DateTime subscriptionStartDate)
+            throws CatalogApiException {
+        return findPlan(new PlanRequestWrapper(productName, term, priceListName), requestedDate, subscriptionStartDate);
+    }
+
+    //
+    // Find a product
+    //
+    @Override
+    public Product findProduct(final String name, final DateTime requestedDate) throws CatalogApiException {
+        return versionForDate(requestedDate).findCurrentProduct(name);
+    }
 
 
     //
     // Find a phase
     //
-	@Override
-	public PlanPhase findPhase(String phaseName, 
-			DateTime requestedDate,
-			DateTime subscriptionStartDate) 
-					throws CatalogApiException {
-		String planName = DefaultPlanPhase.planName(phaseName);
-		Plan plan = findPlan(planName, requestedDate, subscriptionStartDate);
-		return plan.findPhase(phaseName);
-	}
-	
-	
-	//
+    @Override
+    public PlanPhase findPhase(final String phaseName,
+                               final DateTime requestedDate,
+                               final DateTime subscriptionStartDate)
+            throws CatalogApiException {
+        final String planName = DefaultPlanPhase.planName(phaseName);
+        final Plan plan = findPlan(planName, requestedDate, subscriptionStartDate);
+        return plan.findPhase(phaseName);
+    }
+
+
+    //
     // Find a price list
     //
     @Override
-    public PriceList findPriceList(String name, DateTime requestedDate)
+    public PriceList findPriceList(final String name, final DateTime requestedDate)
             throws CatalogApiException {
         return versionForDate(requestedDate).findCurrentPriceList(name);
     }
 
- 
+
     //
     // Rules
     //
-	@Override
-	public ActionPolicy planChangePolicy(PlanPhaseSpecifier from,
-			PlanSpecifier to, DateTime requestedDate) throws CatalogApiException {
-		return versionForDate(requestedDate).planChangePolicy(from, to);
-	}
-
-	@Override
-	public ActionPolicy planCancelPolicy(PlanPhaseSpecifier planPhase, DateTime requestedDate) throws CatalogApiException {
-		return versionForDate(requestedDate).planCancelPolicy(planPhase);
-	}
-
-	@Override
-	public PlanAlignmentChange planChangeAlignment(PlanPhaseSpecifier from,
-			PlanSpecifier to, DateTime requestedDate) throws CatalogApiException {
-		return versionForDate(requestedDate).planChangeAlignment(from, to);
-	}
-
-	@Override
-	public PlanAlignmentCreate planCreateAlignment(PlanSpecifier specifier, DateTime requestedDate) throws CatalogApiException {
-		return versionForDate(requestedDate).planCreateAlignment(specifier);
-	}
-
-	
-
-	@Override
-	public BillingAlignment billingAlignment(PlanPhaseSpecifier planPhase, DateTime requestedDate) throws CatalogApiException {
-		return versionForDate(requestedDate).billingAlignment(planPhase);
-	}
-
-	@Override
-	public PlanChangeResult planChange(PlanPhaseSpecifier from, PlanSpecifier to, DateTime requestedDate)
-			throws CatalogApiException {
-		return versionForDate(requestedDate).planChange(from, to);
-	}
-
-	@Override
-	public boolean canCreatePlan(PlanSpecifier specifier, DateTime requestedDate)
-			throws CatalogApiException {
-		return versionForDate(requestedDate).canCreatePlan(specifier);
-	}
-
-	//
-	// VerifiableConfig API
-	//
-	@Override
-	public void initialize(StandaloneCatalog catalog, URI sourceURI) {
-		for(StandaloneCatalog c : versions) {
-			c.initialize(catalog, sourceURI);
-		}
-	}
-
-	@Override
-	public ValidationErrors validate(StandaloneCatalog catalog, ValidationErrors errors) {
-		for(StandaloneCatalog c : versions) {
-			errors.addAll(c.validate(c, errors));
-		}
-		//TODO MDW validation - ensure all catalog versions have a single name
-		//TODO MDW validation - ensure effective dates are different (actually do we want this?)
-		//TODO MDW validation - check that all products are there
-		//TODO MDW validation - check that all plans are there
-		//TODO MDW validation - check that all currencies are there
-		//TODO MDW validation - check that all pricelists are there
-		return errors;
-	}
-
-	//
-	// Static catalog API
-	//
-	@Override
-	public Date getEffectiveDate() throws CatalogApiException {
-		return versionForDate(clock.getUTCNow()).getEffectiveDate();
-	}
-
-	@Override
-	public Currency[] getCurrentSupportedCurrencies() throws CatalogApiException {
-		return versionForDate(clock.getUTCNow()).getCurrentSupportedCurrencies();
-	}
-
-	@Override
-	public Product[] getCurrentProducts() throws CatalogApiException {
-		return versionForDate(clock.getUTCNow()).getCurrentProducts() ;
-	}
-
-	@Override
-	public Plan[] getCurrentPlans() throws CatalogApiException {
-		return versionForDate(clock.getUTCNow()).getCurrentPlans();
-	}
-
-	@Override
-	public Plan findCurrentPlan(String productName, BillingPeriod term,
-			String priceList) throws CatalogApiException {
-		return versionForDate(clock.getUTCNow()).findCurrentPlan(productName, term, priceList);
-	}
-
-	@Override
-	public Plan findCurrentPlan(String name) throws CatalogApiException {
-		return versionForDate(clock.getUTCNow()).findCurrentPlan(name);
-	}
-
-	@Override
-	public Product findCurrentProduct(String name) throws CatalogApiException {
-		return versionForDate(clock.getUTCNow()).findCurrentProduct(name);
-	}
-
-	@Override
-	public PlanPhase findCurrentPhase(String name) throws CatalogApiException {
-		return versionForDate(clock.getUTCNow()).findCurrentPhase(name);
-	}
-	
-
-    @Override
-    public PriceList findCurrentPricelist(String name)
+    @Override
+    public ActionPolicy planChangePolicy(final PlanPhaseSpecifier from,
+                                         final PlanSpecifier to, final DateTime requestedDate) throws CatalogApiException {
+        return versionForDate(requestedDate).planChangePolicy(from, to);
+    }
+
+    @Override
+    public ActionPolicy planCancelPolicy(final PlanPhaseSpecifier planPhase, final DateTime requestedDate) throws CatalogApiException {
+        return versionForDate(requestedDate).planCancelPolicy(planPhase);
+    }
+
+    @Override
+    public PlanAlignmentChange planChangeAlignment(final PlanPhaseSpecifier from,
+                                                   final PlanSpecifier to, final DateTime requestedDate) throws CatalogApiException {
+        return versionForDate(requestedDate).planChangeAlignment(from, to);
+    }
+
+    @Override
+    public PlanAlignmentCreate planCreateAlignment(final PlanSpecifier specifier, final DateTime requestedDate) throws CatalogApiException {
+        return versionForDate(requestedDate).planCreateAlignment(specifier);
+    }
+
+
+    @Override
+    public BillingAlignment billingAlignment(final PlanPhaseSpecifier planPhase, final DateTime requestedDate) throws CatalogApiException {
+        return versionForDate(requestedDate).billingAlignment(planPhase);
+    }
+
+    @Override
+    public PlanChangeResult planChange(final PlanPhaseSpecifier from, final PlanSpecifier to, final DateTime requestedDate)
+            throws CatalogApiException {
+        return versionForDate(requestedDate).planChange(from, to);
+    }
+
+    @Override
+    public boolean canCreatePlan(final PlanSpecifier specifier, final DateTime requestedDate)
+            throws CatalogApiException {
+        return versionForDate(requestedDate).canCreatePlan(specifier);
+    }
+
+    //
+    // VerifiableConfig API
+    //
+    @Override
+    public void initialize(final StandaloneCatalog catalog, final URI sourceURI) {
+        for (final StandaloneCatalog c : versions) {
+            c.initialize(catalog, sourceURI);
+        }
+    }
+
+    @Override
+    public ValidationErrors validate(final StandaloneCatalog catalog, final ValidationErrors errors) {
+        for (final StandaloneCatalog c : versions) {
+            errors.addAll(c.validate(c, errors));
+        }
+        //TODO MDW validation - ensure all catalog versions have a single name
+        //TODO MDW validation - ensure effective dates are different (actually do we want this?)
+        //TODO MDW validation - check that all products are there
+        //TODO MDW validation - check that all plans are there
+        //TODO MDW validation - check that all currencies are there
+        //TODO MDW validation - check that all pricelists are there
+        return errors;
+    }
+
+    //
+    // Static catalog API
+    //
+    @Override
+    public Date getEffectiveDate() throws CatalogApiException {
+        return versionForDate(clock.getUTCNow()).getEffectiveDate();
+    }
+
+    @Override
+    public Currency[] getCurrentSupportedCurrencies() throws CatalogApiException {
+        return versionForDate(clock.getUTCNow()).getCurrentSupportedCurrencies();
+    }
+
+    @Override
+    public Product[] getCurrentProducts() throws CatalogApiException {
+        return versionForDate(clock.getUTCNow()).getCurrentProducts();
+    }
+
+    @Override
+    public Plan[] getCurrentPlans() throws CatalogApiException {
+        return versionForDate(clock.getUTCNow()).getCurrentPlans();
+    }
+
+    @Override
+    public Plan findCurrentPlan(final String productName, final BillingPeriod term,
+                                final String priceList) throws CatalogApiException {
+        return versionForDate(clock.getUTCNow()).findCurrentPlan(productName, term, priceList);
+    }
+
+    @Override
+    public Plan findCurrentPlan(final String name) throws CatalogApiException {
+        return versionForDate(clock.getUTCNow()).findCurrentPlan(name);
+    }
+
+    @Override
+    public Product findCurrentProduct(final String name) throws CatalogApiException {
+        return versionForDate(clock.getUTCNow()).findCurrentProduct(name);
+    }
+
+    @Override
+    public PlanPhase findCurrentPhase(final String name) throws CatalogApiException {
+        return versionForDate(clock.getUTCNow()).findCurrentPhase(name);
+    }
+
+
+    @Override
+    public PriceList findCurrentPricelist(final String name)
             throws CatalogApiException {
         return versionForDate(clock.getUTCNow()).findCurrentPriceList(name);
     }
 
-	@Override
-	public ActionPolicy planChangePolicy(PlanPhaseSpecifier from,
-			PlanSpecifier to) throws CatalogApiException {
-		return versionForDate(clock.getUTCNow()).planChangePolicy(from, to);
-	}
-
-	@Override
-	public PlanChangeResult planChange(PlanPhaseSpecifier from, PlanSpecifier to)
-			throws CatalogApiException {
-		return versionForDate(clock.getUTCNow()).planChange(from, to);
-	}
-
-	@Override
-	public ActionPolicy planCancelPolicy(PlanPhaseSpecifier planPhase)
-			throws CatalogApiException {
-		return versionForDate(clock.getUTCNow()).planCancelPolicy(planPhase);
-	}
-
-	@Override
-	public PlanAlignmentCreate planCreateAlignment(PlanSpecifier specifier)
-			throws CatalogApiException {
-		return versionForDate(clock.getUTCNow()).planCreateAlignment(specifier);
-	}
-
-	@Override
-	public BillingAlignment billingAlignment(PlanPhaseSpecifier planPhase)
-			throws CatalogApiException {
-		return versionForDate(clock.getUTCNow()).billingAlignment(planPhase);
-	}
-
-	@Override
-	public PlanAlignmentChange planChangeAlignment(PlanPhaseSpecifier from,
-			PlanSpecifier to) throws CatalogApiException {
-		return versionForDate(clock.getUTCNow()).planChangeAlignment(from, to);
-	}
-
-	@Override
-	public boolean canCreatePlan(PlanSpecifier specifier)
-			throws CatalogApiException {
-		return versionForDate(clock.getUTCNow()).canCreatePlan(specifier);
-	}
-
-    @Override
-    public List<Listing> getAvailableAddonListings(String baseProductName) throws CatalogApiException {
+    @Override
+    public ActionPolicy planChangePolicy(final PlanPhaseSpecifier from,
+                                         final PlanSpecifier to) throws CatalogApiException {
+        return versionForDate(clock.getUTCNow()).planChangePolicy(from, to);
+    }
+
+    @Override
+    public PlanChangeResult planChange(final PlanPhaseSpecifier from, final PlanSpecifier to)
+            throws CatalogApiException {
+        return versionForDate(clock.getUTCNow()).planChange(from, to);
+    }
+
+    @Override
+    public ActionPolicy planCancelPolicy(final PlanPhaseSpecifier planPhase)
+            throws CatalogApiException {
+        return versionForDate(clock.getUTCNow()).planCancelPolicy(planPhase);
+    }
+
+    @Override
+    public PlanAlignmentCreate planCreateAlignment(final PlanSpecifier specifier)
+            throws CatalogApiException {
+        return versionForDate(clock.getUTCNow()).planCreateAlignment(specifier);
+    }
+
+    @Override
+    public BillingAlignment billingAlignment(final PlanPhaseSpecifier planPhase)
+            throws CatalogApiException {
+        return versionForDate(clock.getUTCNow()).billingAlignment(planPhase);
+    }
+
+    @Override
+    public PlanAlignmentChange planChangeAlignment(final PlanPhaseSpecifier from,
+                                                   final PlanSpecifier to) throws CatalogApiException {
+        return versionForDate(clock.getUTCNow()).planChangeAlignment(from, to);
+    }
+
+    @Override
+    public boolean canCreatePlan(final PlanSpecifier specifier)
+            throws CatalogApiException {
+        return versionForDate(clock.getUTCNow()).canCreatePlan(specifier);
+    }
+
+    @Override
+    public List<Listing> getAvailableAddonListings(final String baseProductName) throws CatalogApiException {
         return versionForDate(clock.getUTCNow()).getAvailableAddonListings(baseProductName);
     }
 

diff --git a/catalog/src/test/java/com/ning/billing/catalog/CreateCatalogSchema.java b/catalog/src/test/java/com/ning/billing/catalog/CreateCatalogSchema.java
index 4367c9a..b037f6e 100644
--- a/catalog/src/test/java/com/ning/billing/catalog/CreateCatalogSchema.java
+++ b/catalog/src/test/java/com/ning/billing/catalog/CreateCatalogSchema.java
@@ -16,28 +16,28 @@
 
 package com.ning.billing.catalog;
 
-import com.ning.billing.util.config.XMLSchemaGenerator;
-
 import java.io.File;
 import java.io.FileWriter;
 import java.io.Writer;
 
+import com.ning.billing.util.config.XMLSchemaGenerator;
+
 public class CreateCatalogSchema {
 
-	/**
-	 * @param args
-	 */
-	public static void main(String[] args) throws Exception {
-		if(args.length != 1) {
-			System.err.println("Usage: <filepath>");
-			System.exit(0);
-		}
-		
-		File f = new File(args[0]);
-		Writer w = new FileWriter(f);
-		w.write(XMLSchemaGenerator.xmlSchemaAsString(StandaloneCatalog.class));
-		w.close();
-
-	}
+    /**
+     * @param args
+     */
+    public static void main(final String[] args) throws Exception {
+        if (args.length != 1) {
+            System.err.println("Usage: <filepath>");
+            System.exit(0);
+        }
+
+        final File f = new File(args[0]);
+        final Writer w = new FileWriter(f);
+        w.write(XMLSchemaGenerator.xmlSchemaAsString(StandaloneCatalog.class));
+        w.close();
+
+    }
 
 }

diff --git a/catalog/src/test/java/com/ning/billing/catalog/io/TestVersionedCatalogLoader.java b/catalog/src/test/java/com/ning/billing/catalog/io/TestVersionedCatalogLoader.java
index 0d5ac66..dc2b28b 100644
--- a/catalog/src/test/java/com/ning/billing/catalog/io/TestVersionedCatalogLoader.java
+++ b/catalog/src/test/java/com/ning/billing/catalog/io/TestVersionedCatalogLoader.java
@@ -15,16 +15,6 @@
  */
 package com.ning.billing.catalog.io;
 
-import com.google.common.io.Resources;
-import com.ning.billing.catalog.StandaloneCatalog;
-import com.ning.billing.catalog.VersionedCatalog;
-import com.ning.billing.catalog.api.InvalidConfigException;
-import com.ning.billing.lifecycle.KillbillService.ServiceException;
-import com.ning.billing.util.clock.DefaultClock;
-import org.joda.time.DateTime;
-import org.testng.annotations.Test;
-import org.xml.sax.SAXException;
-
 import javax.xml.bind.JAXBException;
 import javax.xml.transform.TransformerException;
 import java.io.IOException;
@@ -35,99 +25,108 @@ import java.net.URL;
 import java.util.Iterator;
 import java.util.List;
 
+import org.joda.time.DateTime;
+import org.testng.annotations.Test;
+import org.xml.sax.SAXException;
+
+import com.google.common.io.Resources;
+import com.ning.billing.catalog.StandaloneCatalog;
+import com.ning.billing.catalog.VersionedCatalog;
+import com.ning.billing.catalog.api.InvalidConfigException;
+import com.ning.billing.lifecycle.KillbillService.ServiceException;
+import com.ning.billing.util.clock.DefaultClock;
+
 import static org.testng.AssertJUnit.assertEquals;
 
 public class TestVersionedCatalogLoader {
-	private final VersionedCatalogLoader loader = new VersionedCatalogLoader(new DefaultClock());
-
-	
-	@Test(enabled=true)
-	public void testAppendToURI() throws MalformedURLException, IOException, URISyntaxException {
-		URL u1 = new URL("http://www.ning.com/foo");
-		assertEquals("http://www.ning.com/foo/bar",loader.appendToURI(u1, "bar").toString());
-
-		URL u2 = new URL("http://www.ning.com/foo/");
-		assertEquals("http://www.ning.com/foo/bar",loader.appendToURI(u2, "bar").toString());
-		
-	}
-	
-	
-
-	
-	@Test(enabled=true)
-	public void testFindXmlFileReferences() throws MalformedURLException, URISyntaxException {
-		String page = "dg.xml\n" + 
-				"replica.foo\n" + 
-				"snv1/\n" + 
-				"viking.xml\n" ;
-		List<URI> urls = loader.findXmlFileReferences(page, new URL("http://ning.com/"));
-		assertEquals(2, urls.size());
-		assertEquals("http://ning.com/dg.xml", urls.get(0).toString());
-		assertEquals("http://ning.com/viking.xml", urls.get(1).toString());
-		
-	}
-	
-	@Test(enabled=true)
-	public void testExtractHrefs() {
-		String page = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">" + 
-				"<html>" + 
-				" <head>" + 
-				"  <title>Index of /config/trunk/xno</title>" + 
-				" </head>" + 
-				" <body>" + 
-				"<h1>Index of /config/trunk/xno</h1>" + 
-				"<ul><li><a href=\"/config/trunk/\"> Parent Directory</a></li>" + 
-				"<li><a href=\"dg.xml\"> dg.xml</a></li>" + 
-				"<li><a href=\"replica.foo\"> replica/</a></li>" + 
-				"<li><a href=\"replica2/\"> replica2/</a></li>" + 
-				"<li><a href=\"replica_dyson/\"> replica_dyson/</a></li>" + 
-				"<li><a href=\"snv1/\"> snv1/</a></li>" + 
-				"<li><a href=\"viking.xml\"> viking.xml</a></li>" + 
-				"</ul>" + 
-				"<address>Apache/2.2.3 (CentOS) Server at <a href=\"mailto:kate@ning.com\">gepo.ningops.net</a> Port 80</address>" + 
-				"</body></html>" ;
-		List<String> hrefs = loader.extractHrefs(page);
-		assertEquals(8, hrefs.size());
-		assertEquals("/config/trunk/", hrefs.get(0));
-		assertEquals("dg.xml", hrefs.get(1));
-	}
-	
-	@Test(enabled=true)
-	public void testFindXmlUrlReferences() throws MalformedURLException, URISyntaxException {
-		String page = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">" + 
-				"<html>" + 
-				" <head>" + 
-				"  <title>Index of /config/trunk/xno</title>" + 
-				" </head>" + 
-				" <body>" + 
-				"<h1>Index of /config/trunk/xno</h1>" + 
-				"<ul><li><a href=\"/config/trunk/\"> Parent Directory</a></li>" + 
-				"<li><a href=\"dg.xml\"> dg.xml</a></li>" + 
-				"<li><a href=\"replica.foo\"> replica/</a></li>" + 
-				"<li><a href=\"replica2/\"> replica2/</a></li>" + 
-				"<li><a href=\"replica_dyson/\"> replica_dyson/</a></li>" + 
-				"<li><a href=\"snv1/\"> snv1/</a></li>" + 
-				"<li><a href=\"viking.xml\"> viking.xml</a></li>" + 
-				"</ul>" + 
-				"<address>Apache/2.2.3 (CentOS) Server at <a href=\"mailto:kate@ning.com\">gepo.ningops.net</a> Port 80</address>" + 
-				"</body></html>" ;
-		List<URI> uris = loader.findXmlUrlReferences(page, new URL("http://ning.com/"));
-		assertEquals(2, uris.size());
-		assertEquals("http://ning.com/dg.xml", uris.get(0).toString());
-		assertEquals("http://ning.com/viking.xml", uris.get(1).toString());
-		
-	}
-	
-	@Test(enabled=true)
-	public void testLoad() throws MalformedURLException, IOException, SAXException, InvalidConfigException, JAXBException, TransformerException, URISyntaxException, ServiceException {
-		VersionedCatalog c = loader.load(Resources.getResource("versionedCatalog").toString());
-		assertEquals(3, c.size());
-		Iterator<StandaloneCatalog> it = c.iterator();
-		DateTime dt = new DateTime("2011-01-01T00:00:00+00:00");
-		assertEquals(dt.toDate(),it.next().getEffectiveDate());
-		dt = new DateTime("2011-02-02T00:00:00+00:00");
-		assertEquals(dt.toDate(),it.next().getEffectiveDate());
-		dt = new DateTime("2011-03-03T00:00:00+00:00");
-		assertEquals(dt.toDate(),it.next().getEffectiveDate());
-	}
+    private final VersionedCatalogLoader loader = new VersionedCatalogLoader(new DefaultClock());
+
+
+    @Test(enabled = true)
+    public void testAppendToURI() throws MalformedURLException, IOException, URISyntaxException {
+        final URL u1 = new URL("http://www.ning.com/foo");
+        assertEquals("http://www.ning.com/foo/bar", loader.appendToURI(u1, "bar").toString());
+
+        final URL u2 = new URL("http://www.ning.com/foo/");
+        assertEquals("http://www.ning.com/foo/bar", loader.appendToURI(u2, "bar").toString());
+
+    }
+
+
+    @Test(enabled = true)
+    public void testFindXmlFileReferences() throws MalformedURLException, URISyntaxException {
+        final String page = "dg.xml\n" +
+                "replica.foo\n" +
+                "snv1/\n" +
+                "viking.xml\n";
+        final List<URI> urls = loader.findXmlFileReferences(page, new URL("http://ning.com/"));
+        assertEquals(2, urls.size());
+        assertEquals("http://ning.com/dg.xml", urls.get(0).toString());
+        assertEquals("http://ning.com/viking.xml", urls.get(1).toString());
+
+    }
+
+    @Test(enabled = true)
+    public void testExtractHrefs() {
+        final String page = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">" +
+                "<html>" +
+                " <head>" +
+                "  <title>Index of /config/trunk/xno</title>" +
+                " </head>" +
+                " <body>" +
+                "<h1>Index of /config/trunk/xno</h1>" +
+                "<ul><li><a href=\"/config/trunk/\"> Parent Directory</a></li>" +
+                "<li><a href=\"dg.xml\"> dg.xml</a></li>" +
+                "<li><a href=\"replica.foo\"> replica/</a></li>" +
+                "<li><a href=\"replica2/\"> replica2/</a></li>" +
+                "<li><a href=\"replica_dyson/\"> replica_dyson/</a></li>" +
+                "<li><a href=\"snv1/\"> snv1/</a></li>" +
+                "<li><a href=\"viking.xml\"> viking.xml</a></li>" +
+                "</ul>" +
+                "<address>Apache/2.2.3 (CentOS) Server at <a href=\"mailto:kate@ning.com\">gepo.ningops.net</a> Port 80</address>" +
+                "</body></html>";
+        final List<String> hrefs = loader.extractHrefs(page);
+        assertEquals(8, hrefs.size());
+        assertEquals("/config/trunk/", hrefs.get(0));
+        assertEquals("dg.xml", hrefs.get(1));
+    }
+
+    @Test(enabled = true)
+    public void testFindXmlUrlReferences() throws MalformedURLException, URISyntaxException {
+        final String page = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">" +
+                "<html>" +
+                " <head>" +
+                "  <title>Index of /config/trunk/xno</title>" +
+                " </head>" +
+                " <body>" +
+                "<h1>Index of /config/trunk/xno</h1>" +
+                "<ul><li><a href=\"/config/trunk/\"> Parent Directory</a></li>" +
+                "<li><a href=\"dg.xml\"> dg.xml</a></li>" +
+                "<li><a href=\"replica.foo\"> replica/</a></li>" +
+                "<li><a href=\"replica2/\"> replica2/</a></li>" +
+                "<li><a href=\"replica_dyson/\"> replica_dyson/</a></li>" +
+                "<li><a href=\"snv1/\"> snv1/</a></li>" +
+                "<li><a href=\"viking.xml\"> viking.xml</a></li>" +
+                "</ul>" +
+                "<address>Apache/2.2.3 (CentOS) Server at <a href=\"mailto:kate@ning.com\">gepo.ningops.net</a> Port 80</address>" +
+                "</body></html>";
+        final List<URI> uris = loader.findXmlUrlReferences(page, new URL("http://ning.com/"));
+        assertEquals(2, uris.size());
+        assertEquals("http://ning.com/dg.xml", uris.get(0).toString());
+        assertEquals("http://ning.com/viking.xml", uris.get(1).toString());
+
+    }
+
+    @Test(enabled = true)
+    public void testLoad() throws MalformedURLException, IOException, SAXException, InvalidConfigException, JAXBException, TransformerException, URISyntaxException, ServiceException {
+        final VersionedCatalog c = loader.load(Resources.getResource("versionedCatalog").toString());
+        assertEquals(3, c.size());
+        final Iterator<StandaloneCatalog> it = c.iterator();
+        DateTime dt = new DateTime("2011-01-01T00:00:00+00:00");
+        assertEquals(dt.toDate(), it.next().getEffectiveDate());
+        dt = new DateTime("2011-02-02T00:00:00+00:00");
+        assertEquals(dt.toDate(), it.next().getEffectiveDate());
+        dt = new DateTime("2011-03-03T00:00:00+00:00");
+        assertEquals(dt.toDate(), it.next().getEffectiveDate());
+    }
 }

diff --git a/catalog/src/test/java/com/ning/billing/catalog/io/TestXMLReader.java b/catalog/src/test/java/com/ning/billing/catalog/io/TestXMLReader.java
index 77f7248..b03f18b 100644
--- a/catalog/src/test/java/com/ning/billing/catalog/io/TestXMLReader.java
+++ b/catalog/src/test/java/com/ning/billing/catalog/io/TestXMLReader.java
@@ -16,17 +16,18 @@
 
 package com.ning.billing.catalog.io;
 
+import org.testng.annotations.Test;
+
 import com.google.common.io.Resources;
 import com.ning.billing.catalog.StandaloneCatalog;
 import com.ning.billing.util.config.XMLLoader;
-import org.testng.annotations.Test;
 
 public class TestXMLReader {
 
-	@Test(enabled=true)
-	public void testCatalogLoad() throws Exception {
-		XMLLoader.getObjectFromString(Resources.getResource("WeaponsHire.xml").toExternalForm(), StandaloneCatalog.class);
-		XMLLoader.getObjectFromString(Resources.getResource("WeaponsHireSmall.xml").toExternalForm(), StandaloneCatalog.class);
-	}
-	
+    @Test(enabled = true)
+    public void testCatalogLoad() throws Exception {
+        XMLLoader.getObjectFromString(Resources.getResource("WeaponsHire.xml").toExternalForm(), StandaloneCatalog.class);
+        XMLLoader.getObjectFromString(Resources.getResource("WeaponsHireSmall.xml").toExternalForm(), StandaloneCatalog.class);
+    }
+
 }

diff --git a/catalog/src/test/java/com/ning/billing/catalog/MockCatalog.java b/catalog/src/test/java/com/ning/billing/catalog/MockCatalog.java
index ac090de..c4e1f84 100644
--- a/catalog/src/test/java/com/ning/billing/catalog/MockCatalog.java
+++ b/catalog/src/test/java/com/ning/billing/catalog/MockCatalog.java
@@ -42,195 +42,194 @@ import com.ning.billing.catalog.rules.CaseCreateAlignment;
 import com.ning.billing.catalog.rules.PlanRules;
 
 public class MockCatalog extends StandaloneCatalog implements Catalog {
-	private static final String[] PRODUCT_NAMES = new String[]{ "TestProduct1", "TestProduct2", "TestProduct3"};
+    private static final String[] PRODUCT_NAMES = new String[]{"TestProduct1", "TestProduct2", "TestProduct3"};
     private boolean canCreatePlan;
     private PlanChangeResult planChange;
     private BillingAlignment billingAlignment;
     private PlanAlignmentCreate planCreateAlignment;
-	
-	public MockCatalog() {
-		setEffectiveDate(new Date());
-		setProducts(MockProduct.createAll());
-		setPlans((DefaultPlan[])MockPlan.createAll());
-		populateRules();
-		populatePriceLists();
-	}
-
-    public void populateRules(){
-		setPlanRules(new PlanRules());
-	}
-
-	public void setRules( 
-			CaseChangePlanPolicy[] caseChangePlanPolicy,
-			CaseChangePlanAlignment[] caseChangePlanAlignment,
-			CaseCancelPolicy[] caseCancelPolicy,
-			CaseCreateAlignment[] caseCreateAlignment
-			){
-		
-	}
-	
-	
-
-	public void populatePriceLists() {
-		DefaultPlan[] plans = getCurrentPlans();
-		
-		DefaultPriceList[] priceList = new DefaultPriceList[plans.length - 1];
-		for(int i = 1; i < plans.length; i++) {
-			priceList[i-1] = new DefaultPriceList(new DefaultPlan[]{plans[i]},plans[i].getName()+ "-pl");
-		}
-		
-		DefaultPriceListSet set = new DefaultPriceListSet(new PriceListDefault(new DefaultPlan[]{plans[0]}),priceList);
-		setPriceLists(set);
-	}
-	
-	public String[] getProductNames() {
-		return PRODUCT_NAMES;
-	}
-
-    @Override
-    public Currency[] getSupportedCurrencies(DateTime requestedDate) throws CatalogApiException {
+
+    public MockCatalog() {
+        setEffectiveDate(new Date());
+        setProducts(MockProduct.createAll());
+        setPlans((DefaultPlan[]) MockPlan.createAll());
+        populateRules();
+        populatePriceLists();
+    }
+
+    public void populateRules() {
+        setPlanRules(new PlanRules());
+    }
+
+    public void setRules(
+            final CaseChangePlanPolicy[] caseChangePlanPolicy,
+            final CaseChangePlanAlignment[] caseChangePlanAlignment,
+            final CaseCancelPolicy[] caseCancelPolicy,
+            final CaseCreateAlignment[] caseCreateAlignment
+                        ) {
+
+    }
+
+
+    public void populatePriceLists() {
+        final DefaultPlan[] plans = getCurrentPlans();
+
+        final DefaultPriceList[] priceList = new DefaultPriceList[plans.length - 1];
+        for (int i = 1; i < plans.length; i++) {
+            priceList[i - 1] = new DefaultPriceList(new DefaultPlan[]{plans[i]}, plans[i].getName() + "-pl");
+        }
+
+        final DefaultPriceListSet set = new DefaultPriceListSet(new PriceListDefault(new DefaultPlan[]{plans[0]}), priceList);
+        setPriceLists(set);
+    }
+
+    public String[] getProductNames() {
+        return PRODUCT_NAMES;
+    }
+
+    @Override
+    public Currency[] getSupportedCurrencies(final DateTime requestedDate) throws CatalogApiException {
         return getCurrentSupportedCurrencies();
     }
 
     @Override
-    public Product[] getProducts(DateTime requestedDate) throws CatalogApiException {
-       return getCurrentProducts();
+    public Product[] getProducts(final DateTime requestedDate) throws CatalogApiException {
+        return getCurrentProducts();
     }
 
     @Override
-    public Plan[] getPlans(DateTime requestedDate) throws CatalogApiException {
+    public Plan[] getPlans(final DateTime requestedDate) throws CatalogApiException {
         return getCurrentPlans();
     }
 
     @Override
-    public Plan findPlan(String name, DateTime requestedDate) throws CatalogApiException {
+    public Plan findPlan(final String name, final DateTime requestedDate) throws CatalogApiException {
         return findCurrentPlan(name);
     }
 
     @Override
-    public Plan findPlan(String productName, BillingPeriod term, String priceListName, DateTime requestedDate)
+    public Plan findPlan(final String productName, final BillingPeriod term, final String priceListName, final DateTime requestedDate)
             throws CatalogApiException {
         return findCurrentPlan(productName, term, priceListName);
     }
 
     @Override
-    public Plan findPlan(String name, DateTime effectiveDate, DateTime subscriptionStartDate)
+    public Plan findPlan(final String name, final DateTime effectiveDate, final DateTime subscriptionStartDate)
             throws CatalogApiException {
         return findCurrentPlan(name);
     }
 
     @Override
-    public Plan findPlan(String productName, BillingPeriod term, String priceListName, DateTime requestedDate,
-            DateTime subscriptionStartDate) throws CatalogApiException {
-       return findCurrentPlan(productName, term, priceListName);
+    public Plan findPlan(final String productName, final BillingPeriod term, final String priceListName, final DateTime requestedDate,
+                         final DateTime subscriptionStartDate) throws CatalogApiException {
+        return findCurrentPlan(productName, term, priceListName);
     }
-    
+
     @Override
-    public Product findProduct(String name, DateTime requestedDate) throws CatalogApiException {
+    public Product findProduct(final String name, final DateTime requestedDate) throws CatalogApiException {
         return findCurrentProduct(name);
     }
 
     @Override
-    public PlanPhase findPhase(String name, DateTime requestedDate, DateTime subscriptionStartDate)
+    public PlanPhase findPhase(final String name, final DateTime requestedDate, final DateTime subscriptionStartDate)
             throws CatalogApiException {
         return findCurrentPhase(name);
     }
 
     @Override
-    public PriceList findPriceList(String name, DateTime requestedDate) throws CatalogApiException {
+    public PriceList findPriceList(final String name, final DateTime requestedDate) throws CatalogApiException {
         return findCurrentPricelist(name);
     }
 
     @Override
-    public ActionPolicy planChangePolicy(PlanPhaseSpecifier from, PlanSpecifier to, DateTime requestedDate)
+    public ActionPolicy planChangePolicy(final PlanPhaseSpecifier from, final PlanSpecifier to, final DateTime requestedDate)
             throws CatalogApiException {
         return planChangePolicy(from, to);
     }
 
     @Override
-    public PlanChangeResult planChange(PlanPhaseSpecifier from, PlanSpecifier to, DateTime requestedDate)
+    public PlanChangeResult planChange(final PlanPhaseSpecifier from, final PlanSpecifier to, final DateTime requestedDate)
             throws CatalogApiException {
         return planChange(from, to);
     }
 
     @Override
-    public ActionPolicy planCancelPolicy(PlanPhaseSpecifier planPhase, DateTime requestedDate)
+    public ActionPolicy planCancelPolicy(final PlanPhaseSpecifier planPhase, final DateTime requestedDate)
             throws CatalogApiException {
         return planCancelPolicy(planPhase);
     }
 
     @Override
-    public PlanAlignmentCreate planCreateAlignment(PlanSpecifier specifier, DateTime requestedDate)
+    public PlanAlignmentCreate planCreateAlignment(final PlanSpecifier specifier, final DateTime requestedDate)
             throws CatalogApiException {
-        return planCreateAlignment(specifier);  
+        return planCreateAlignment(specifier);
     }
 
     @Override
-    public BillingAlignment billingAlignment(PlanPhaseSpecifier planPhase, DateTime requestedDate)
+    public BillingAlignment billingAlignment(final PlanPhaseSpecifier planPhase, final DateTime requestedDate)
             throws CatalogApiException {
         return billingAlignment(planPhase);
     }
 
     @Override
-    public PlanAlignmentChange planChangeAlignment(PlanPhaseSpecifier from, PlanSpecifier to, DateTime requestedDate)
+    public PlanAlignmentChange planChangeAlignment(final PlanPhaseSpecifier from, final PlanSpecifier to, final DateTime requestedDate)
             throws CatalogApiException {
         return planChangeAlignment(from, to);
     }
 
     @Override
-    public boolean canCreatePlan(PlanSpecifier specifier, DateTime requestedDate) throws CatalogApiException {
+    public boolean canCreatePlan(final PlanSpecifier specifier, final DateTime requestedDate) throws CatalogApiException {
         return canCreatePlan(specifier);
     }
 
     @Override
-    public ActionPolicy planChangePolicy(PlanPhaseSpecifier from, PlanSpecifier to) throws CatalogApiException {
+    public ActionPolicy planChangePolicy(final PlanPhaseSpecifier from, final PlanSpecifier to) throws CatalogApiException {
         return super.planChangePolicy(from, to);
     }
 
     @Override
-    public PlanAlignmentChange planChangeAlignment(PlanPhaseSpecifier from, PlanSpecifier to)
+    public PlanAlignmentChange planChangeAlignment(final PlanPhaseSpecifier from, final PlanSpecifier to)
             throws CatalogApiException {
         return super.planChangeAlignment(from, to);
     }
 
     @Override
-    public ActionPolicy planCancelPolicy(PlanPhaseSpecifier planPhase) throws CatalogApiException {
+    public ActionPolicy planCancelPolicy(final PlanPhaseSpecifier planPhase) throws CatalogApiException {
         return super.planCancelPolicy(planPhase);
     }
 
     @Override
-    public PlanAlignmentCreate planCreateAlignment(PlanSpecifier specifier) throws CatalogApiException {
+    public PlanAlignmentCreate planCreateAlignment(final PlanSpecifier specifier) throws CatalogApiException {
         return planCreateAlignment;
     }
 
     @Override
-    public BillingAlignment billingAlignment(PlanPhaseSpecifier planPhase) throws CatalogApiException {
+    public BillingAlignment billingAlignment(final PlanPhaseSpecifier planPhase) throws CatalogApiException {
         return billingAlignment;
     }
 
     @Override
-    public PlanChangeResult planChange(PlanPhaseSpecifier from, PlanSpecifier to) throws CatalogApiException {
+    public PlanChangeResult planChange(final PlanPhaseSpecifier from, final PlanSpecifier to) throws CatalogApiException {
         return planChange;
     }
 
     @Override
-    public boolean canCreatePlan(PlanSpecifier specifier) throws CatalogApiException {
+    public boolean canCreatePlan(final PlanSpecifier specifier) throws CatalogApiException {
         return canCreatePlan;
     }
 
-    public void setCanCreatePlan(boolean canCreatePlan) {
+    public void setCanCreatePlan(final boolean canCreatePlan) {
         this.canCreatePlan = canCreatePlan;
     }
 
-    public void setPlanChange(PlanChangeResult planChange) {
+    public void setPlanChange(final PlanChangeResult planChange) {
         this.planChange = planChange;
     }
 
-    public void setBillingAlignment(BillingAlignment billingAlignment) {
+    public void setBillingAlignment(final BillingAlignment billingAlignment) {
         this.billingAlignment = billingAlignment;
     }
 
-    public void setPlanCreateAlignment(PlanAlignmentCreate planCreateAlignment) {
+    public void setPlanCreateAlignment(final PlanAlignmentCreate planCreateAlignment) {
         this.planCreateAlignment = planCreateAlignment;
     }
 

diff --git a/catalog/src/test/java/com/ning/billing/catalog/MockCatalogModule.java b/catalog/src/test/java/com/ning/billing/catalog/MockCatalogModule.java
index d61d6ae..4af0136 100644
--- a/catalog/src/test/java/com/ning/billing/catalog/MockCatalogModule.java
+++ b/catalog/src/test/java/com/ning/billing/catalog/MockCatalogModule.java
@@ -28,12 +28,12 @@ public class MockCatalogModule extends AbstractModule {
     protected void configure() {
         CatalogService catalogService = BrainDeadProxyFactory.createBrainDeadProxyFor(CatalogService.class);
         ((ZombieControl) catalogService).addResult("getCurrentCatalog", new MockCatalog());
-        
+
         catalogService = BrainDeadProxyFactory.createBrainDeadProxyFor(CatalogService.class);
-        Catalog catalog = BrainDeadProxyFactory.createBrainDeadProxyFor(Catalog.class);
+        final Catalog catalog = BrainDeadProxyFactory.createBrainDeadProxyFor(Catalog.class);
+
+        ((ZombieControl) catalogService).addResult("getFullCatalog", catalog);
 
-        ((ZombieControl) catalogService).addResult("getFullCatalog", catalog); 
-        
         bind(CatalogService.class).toInstance(catalogService);
     }
 }

diff --git a/catalog/src/test/java/com/ning/billing/catalog/MockCatalogService.java b/catalog/src/test/java/com/ning/billing/catalog/MockCatalogService.java
index f7277c7..ddd235c 100644
--- a/catalog/src/test/java/com/ning/billing/catalog/MockCatalogService.java
+++ b/catalog/src/test/java/com/ning/billing/catalog/MockCatalogService.java
@@ -22,9 +22,9 @@ import com.ning.billing.catalog.api.StaticCatalog;
 
 public class MockCatalogService extends DefaultCatalogService {
 
-    private MockCatalog catalog;
+    private final MockCatalog catalog;
 
-    public MockCatalogService(MockCatalog catalog) {
+    public MockCatalogService(final MockCatalog catalog) {
         super(null, null);
         this.catalog = catalog;
     }
@@ -45,7 +45,7 @@ public class MockCatalogService extends DefaultCatalogService {
 
     @Override
     public Catalog get() {
-         return catalog;
+        return catalog;
     }
 
     @Override
@@ -53,5 +53,5 @@ public class MockCatalogService extends DefaultCatalogService {
         return catalog;
     }
 
-    
+
 }

diff --git a/catalog/src/test/java/com/ning/billing/catalog/MockInternationalPrice.java b/catalog/src/test/java/com/ning/billing/catalog/MockInternationalPrice.java
index 3df36aa..b94b713 100644
--- a/catalog/src/test/java/com/ning/billing/catalog/MockInternationalPrice.java
+++ b/catalog/src/test/java/com/ning/billing/catalog/MockInternationalPrice.java
@@ -21,21 +21,21 @@ import java.math.BigDecimal;
 import com.ning.billing.catalog.api.Currency;
 
 public class MockInternationalPrice extends DefaultInternationalPrice {
-	
-	public static MockInternationalPrice create0USD() {
-		return new MockInternationalPrice(new DefaultPrice().setCurrency(Currency.USD).setValue(BigDecimal.ZERO));
-	}
-	
-	public static MockInternationalPrice create1USD() {
-		return new MockInternationalPrice(new DefaultPrice().setCurrency(Currency.USD).setValue(BigDecimal.ONE));
-	}
-
-	public static MockInternationalPrice createUSD(String value) {
-		return new MockInternationalPrice(new DefaultPrice().setCurrency(Currency.USD).setValue(new BigDecimal(value)));
-	}
-
-	public MockInternationalPrice(DefaultPrice... price) {
-		setPrices(price);
-	}
+
+    public static MockInternationalPrice create0USD() {
+        return new MockInternationalPrice(new DefaultPrice().setCurrency(Currency.USD).setValue(BigDecimal.ZERO));
+    }
+
+    public static MockInternationalPrice create1USD() {
+        return new MockInternationalPrice(new DefaultPrice().setCurrency(Currency.USD).setValue(BigDecimal.ONE));
+    }
+
+    public static MockInternationalPrice createUSD(final String value) {
+        return new MockInternationalPrice(new DefaultPrice().setCurrency(Currency.USD).setValue(new BigDecimal(value)));
+    }
+
+    public MockInternationalPrice(final DefaultPrice... price) {
+        setPrices(price);
+    }
 
 }

diff --git a/catalog/src/test/java/com/ning/billing/catalog/MockPlan.java b/catalog/src/test/java/com/ning/billing/catalog/MockPlan.java
index f4dfab1..7774d7c 100644
--- a/catalog/src/test/java/com/ning/billing/catalog/MockPlan.java
+++ b/catalog/src/test/java/com/ning/billing/catalog/MockPlan.java
@@ -18,124 +18,122 @@ package com.ning.billing.catalog;
 
 
 public class MockPlan extends DefaultPlan {
-	
-	public static MockPlan createBicycleTrialEvergreen1USD(int trialDurationInDays) {
-		return new MockPlan("BicycleTrialEvergreen1USD",
-				MockProduct.createBicycle(),
-				new DefaultPlanPhase[]{ MockPlanPhase.createTrial(trialDurationInDays) },
-				MockPlanPhase.create1USDMonthlyEvergreen(),
-				-1);
-	}
-
-	
-	public static MockPlan createBicycleTrialEvergreen1USD() {
-		return new MockPlan("BicycleTrialEvergreen1USD",
-				MockProduct.createBicycle(),
-				new DefaultPlanPhase[]{ MockPlanPhase.create30DayTrial() },
-				MockPlanPhase.create1USDMonthlyEvergreen(),
-				-1);
-	}
-
-	public static MockPlan createSportsCarTrialEvergreen100USD() {
-		return new MockPlan("SportsCarTrialEvergreen100USD",
-				MockProduct.createSportsCar(),
-				new DefaultPlanPhase[]{ MockPlanPhase.create30DayTrial() },
-				MockPlanPhase.createUSDMonthlyEvergreen("100.00",null),
-				-1);
-	}
-	
-	public static MockPlan createPickupTrialEvergreen10USD() {
-		return new MockPlan("PickupTrialEvergreen10USD",
-				MockProduct.createPickup(),
-				new DefaultPlanPhase[]{ MockPlanPhase.create30DayTrial() },
-				MockPlanPhase.createUSDMonthlyEvergreen("10.00",null),
-				-1);
-	}
-
-	public static MockPlan createJetTrialEvergreen1000USD() {
-		return new MockPlan("JetTrialEvergreen1000USD",
-				MockProduct.createJet(),
-				new DefaultPlanPhase[]{ MockPlanPhase.create30DayTrial() },
-				MockPlanPhase.create1USDMonthlyEvergreen(),
-				-1);
-	}
+
+    public static MockPlan createBicycleTrialEvergreen1USD(final int trialDurationInDays) {
+        return new MockPlan("BicycleTrialEvergreen1USD",
+                            MockProduct.createBicycle(),
+                            new DefaultPlanPhase[]{MockPlanPhase.createTrial(trialDurationInDays)},
+                            MockPlanPhase.create1USDMonthlyEvergreen(),
+                            -1);
+    }
+
+
+    public static MockPlan createBicycleTrialEvergreen1USD() {
+        return new MockPlan("BicycleTrialEvergreen1USD",
+                            MockProduct.createBicycle(),
+                            new DefaultPlanPhase[]{MockPlanPhase.create30DayTrial()},
+                            MockPlanPhase.create1USDMonthlyEvergreen(),
+                            -1);
+    }
+
+    public static MockPlan createSportsCarTrialEvergreen100USD() {
+        return new MockPlan("SportsCarTrialEvergreen100USD",
+                            MockProduct.createSportsCar(),
+                            new DefaultPlanPhase[]{MockPlanPhase.create30DayTrial()},
+                            MockPlanPhase.createUSDMonthlyEvergreen("100.00", null),
+                            -1);
+    }
+
+    public static MockPlan createPickupTrialEvergreen10USD() {
+        return new MockPlan("PickupTrialEvergreen10USD",
+                            MockProduct.createPickup(),
+                            new DefaultPlanPhase[]{MockPlanPhase.create30DayTrial()},
+                            MockPlanPhase.createUSDMonthlyEvergreen("10.00", null),
+                            -1);
+    }
+
+    public static MockPlan createJetTrialEvergreen1000USD() {
+        return new MockPlan("JetTrialEvergreen1000USD",
+                            MockProduct.createJet(),
+                            new DefaultPlanPhase[]{MockPlanPhase.create30DayTrial()},
+                            MockPlanPhase.create1USDMonthlyEvergreen(),
+                            -1);
+    }
 
     public static MockPlan createJetTrialFixedTermEvergreen1000USD() {
         return new MockPlan("JetTrialEvergreen1000USD",
-                MockProduct.createJet(),
-                new DefaultPlanPhase[]{ MockPlanPhase.create30DayTrial(), MockPlanPhase.createUSDMonthlyFixedTerm("500.00", null, 6) },
-                MockPlanPhase.create1USDMonthlyEvergreen(),
-                -1);
+                            MockProduct.createJet(),
+                            new DefaultPlanPhase[]{MockPlanPhase.create30DayTrial(), MockPlanPhase.createUSDMonthlyFixedTerm("500.00", null, 6)},
+                            MockPlanPhase.create1USDMonthlyEvergreen(),
+                            -1);
     }
 
     public static MockPlan createHornMonthlyNoTrial1USD() {
         return new MockPlan("Horn1USD",
-                MockProduct.createHorn(),
-                new DefaultPlanPhase[]{ },
-                MockPlanPhase.create1USDMonthlyEvergreen(),
-                -1);
+                            MockProduct.createHorn(),
+                            new DefaultPlanPhase[]{},
+                            MockPlanPhase.create1USDMonthlyEvergreen(),
+                            -1);
+    }
+
+    public MockPlan() {
+        this("BicycleTrialEvergreen1USD",
+             MockProduct.createBicycle(),
+             new DefaultPlanPhase[]{MockPlanPhase.create30DayTrial()},
+             MockPlanPhase.create1USDMonthlyEvergreen(),
+             -1);
+    }
+
+    public MockPlan(final String name, final DefaultProduct product, final DefaultPlanPhase[] planPhases, final DefaultPlanPhase finalPhase, final int plansAllowedInBundle) {
+        setName(name);
+        setProduct(product);
+        setFinalPhase(finalPhase);
+        setInitialPhases(planPhases);
+        setPlansAllowedInBundle(plansAllowedInBundle);
+
+        finalPhase.setPlan(this);
+        for (final DefaultPlanPhase pp : planPhases) {
+            pp.setPlan(this);
+        }
+    }
+
+
+    public static MockPlan createBicycleNoTrialEvergreen1USD() {
+        return new MockPlan("BicycleNoTrialEvergreen1USD",
+                            MockProduct.createBicycle(),
+                            new DefaultPlanPhase[]{},
+                            MockPlanPhase.createUSDMonthlyEvergreen("1.0", null),
+                            -1);
+    }
+
+    public MockPlan(final MockPlanPhase mockPlanPhase) {
+        setName("Test");
+        setProduct(MockProduct.createBicycle());
+        setFinalPhase(mockPlanPhase);
+
+        mockPlanPhase.setPlan(this);
+    }
+
+    public MockPlan(final String planName) {
+        setName(planName);
+        setProduct(new MockProduct());
+        setFinalPhase(new MockPlanPhase(this));
+        setInitialPhases(null);
+        setPlansAllowedInBundle(1);
+    }
+
+
+    public static DefaultPlan[] createAll() {
+        return new DefaultPlan[]{
+                createBicycleTrialEvergreen1USD(),
+                createBicycleNoTrialEvergreen1USD(),
+                createPickupTrialEvergreen10USD(),
+                createSportsCarTrialEvergreen100USD(),
+                createJetTrialEvergreen1000USD(),
+                createJetTrialFixedTermEvergreen1000USD(),
+                createHornMonthlyNoTrial1USD()
+        };
     }
 
-	public MockPlan() {
-		this("BicycleTrialEvergreen1USD",
-				MockProduct.createBicycle(),
-				new DefaultPlanPhase[]{ MockPlanPhase.create30DayTrial()},
-				MockPlanPhase.create1USDMonthlyEvergreen(),
-				-1);
-	}
-
-	public MockPlan(String name, DefaultProduct product, DefaultPlanPhase[] planPhases, DefaultPlanPhase finalPhase, int plansAllowedInBundle) {
-		setName(name);
-		setProduct(product);
-		setFinalPhase(finalPhase);
-		setInitialPhases(planPhases);
-		setPlansAllowedInBundle(plansAllowedInBundle);
-		
-		finalPhase.setPlan(this);
-		for (DefaultPlanPhase pp : planPhases) {
-			pp.setPlan(this);
-		}
-	}
-
-
-
-	public static MockPlan createBicycleNoTrialEvergreen1USD() {
-		return new MockPlan("BicycleNoTrialEvergreen1USD",
-				MockProduct.createBicycle(),
-				new DefaultPlanPhase[]{ },
-				MockPlanPhase.createUSDMonthlyEvergreen("1.0", null)	,
-				-1);
-	}
-	
-	public MockPlan(MockPlanPhase mockPlanPhase) {
-		setName("Test");
-		setProduct(MockProduct.createBicycle());
-		setFinalPhase(mockPlanPhase);
-		
-		mockPlanPhase.setPlan(this);
-	}
-
-	  public MockPlan(String planName) {
-			setName(planName);
-			setProduct(new MockProduct());
-			setFinalPhase(new MockPlanPhase(this));
-			setInitialPhases(null);
-			setPlansAllowedInBundle(1);
-	  }
-
-
-	public static DefaultPlan[] createAll() {
-		return new DefaultPlan[]{
-				createBicycleTrialEvergreen1USD(),
-				createBicycleNoTrialEvergreen1USD(),
-				createPickupTrialEvergreen10USD(),
-				createSportsCarTrialEvergreen100USD(),
-				createJetTrialEvergreen1000USD(),
-				createJetTrialFixedTermEvergreen1000USD(),
-				createHornMonthlyNoTrial1USD()
-		};
-	}
-	
-	
 
 }

diff --git a/catalog/src/test/java/com/ning/billing/catalog/MockPlanPhase.java b/catalog/src/test/java/com/ning/billing/catalog/MockPlanPhase.java
index b995bef..ed3e103 100644
--- a/catalog/src/test/java/com/ning/billing/catalog/MockPlanPhase.java
+++ b/catalog/src/test/java/com/ning/billing/catalog/MockPlanPhase.java
@@ -24,100 +24,100 @@ import com.ning.billing.catalog.api.Plan;
 import com.ning.billing.catalog.api.TimeUnit;
 
 public class MockPlanPhase extends DefaultPlanPhase {
-	
-	public static MockPlanPhase create1USDMonthlyEvergreen() {
-		return (MockPlanPhase) new MockPlanPhase(BillingPeriod.MONTHLY,
-				PhaseType.EVERGREEN,
-				new DefaultDuration().setUnit(TimeUnit.UNLIMITED),
-				MockInternationalPrice.create1USD(),
-				null).setPlan(MockPlan.createBicycleNoTrialEvergreen1USD());
-	}
-	
-	public static MockPlanPhase createUSDMonthlyEvergreen(String reccuringUSDPrice, String fixedPrice) {
-		return new MockPlanPhase(BillingPeriod.MONTHLY,
-				PhaseType.EVERGREEN,
-				new DefaultDuration().setUnit(TimeUnit.UNLIMITED),
-				(reccuringUSDPrice == null) ? null : MockInternationalPrice.createUSD(reccuringUSDPrice),
-				(fixedPrice == null) ? null :MockInternationalPrice.createUSD(fixedPrice));
-	}
-
-	public static MockPlanPhase createUSDMonthlyFixedTerm(String reccuringUSDPrice, String fixedPrice, int durationInMonths) {
-		return new MockPlanPhase(BillingPeriod.MONTHLY,
-				PhaseType.FIXEDTERM,
-				new DefaultDuration().setUnit(TimeUnit.MONTHS).setNumber(durationInMonths),
-				(reccuringUSDPrice == null) ? null : MockInternationalPrice.createUSD(reccuringUSDPrice),
-				(fixedPrice == null) ? null :MockInternationalPrice.createUSD(fixedPrice));
-	}
-
-	public static MockPlanPhase create30DayTrial() {
-		return createTrial(30);
-	}
-
-	public static MockPlanPhase createTrial(int days) {
-		return new MockPlanPhase(BillingPeriod.NO_BILLING_PERIOD,
-				PhaseType.TRIAL,
-				new DefaultDuration().setUnit(TimeUnit.DAYS).setNumber(days),
-				null,
-				MockInternationalPrice.create1USD()
-				);
-	}
+
+    public static MockPlanPhase create1USDMonthlyEvergreen() {
+        return (MockPlanPhase) new MockPlanPhase(BillingPeriod.MONTHLY,
+                                                 PhaseType.EVERGREEN,
+                                                 new DefaultDuration().setUnit(TimeUnit.UNLIMITED),
+                                                 MockInternationalPrice.create1USD(),
+                                                 null).setPlan(MockPlan.createBicycleNoTrialEvergreen1USD());
+    }
+
+    public static MockPlanPhase createUSDMonthlyEvergreen(final String reccuringUSDPrice, final String fixedPrice) {
+        return new MockPlanPhase(BillingPeriod.MONTHLY,
+                                 PhaseType.EVERGREEN,
+                                 new DefaultDuration().setUnit(TimeUnit.UNLIMITED),
+                                 (reccuringUSDPrice == null) ? null : MockInternationalPrice.createUSD(reccuringUSDPrice),
+                                 (fixedPrice == null) ? null : MockInternationalPrice.createUSD(fixedPrice));
+    }
+
+    public static MockPlanPhase createUSDMonthlyFixedTerm(final String reccuringUSDPrice, final String fixedPrice, final int durationInMonths) {
+        return new MockPlanPhase(BillingPeriod.MONTHLY,
+                                 PhaseType.FIXEDTERM,
+                                 new DefaultDuration().setUnit(TimeUnit.MONTHS).setNumber(durationInMonths),
+                                 (reccuringUSDPrice == null) ? null : MockInternationalPrice.createUSD(reccuringUSDPrice),
+                                 (fixedPrice == null) ? null : MockInternationalPrice.createUSD(fixedPrice));
+    }
+
+    public static MockPlanPhase create30DayTrial() {
+        return createTrial(30);
+    }
+
+    public static MockPlanPhase createTrial(final int days) {
+        return new MockPlanPhase(BillingPeriod.NO_BILLING_PERIOD,
+                                 PhaseType.TRIAL,
+                                 new DefaultDuration().setUnit(TimeUnit.DAYS).setNumber(days),
+                                 null,
+                                 MockInternationalPrice.create1USD()
+        );
+    }
 
     public MockPlanPhase(
-    		BillingPeriod billingPeriod, 
-    		PhaseType type, 
-    		DefaultDuration duration, 
-    		DefaultInternationalPrice recurringPrice, 
-    		DefaultInternationalPrice fixedPrice) {
-		setBillingPeriod(billingPeriod);
-		setPhaseType(type);
-		setDuration(duration);
-		setRecurringPrice(recurringPrice);
-		setFixedPrice(fixedPrice);
-	}
-    
-  
+            final BillingPeriod billingPeriod,
+            final PhaseType type,
+            final DefaultDuration duration,
+            final DefaultInternationalPrice recurringPrice,
+            final DefaultInternationalPrice fixedPrice) {
+        setBillingPeriod(billingPeriod);
+        setPhaseType(type);
+        setDuration(duration);
+        setRecurringPrice(recurringPrice);
+        setFixedPrice(fixedPrice);
+    }
+
+
     public MockPlanPhase() {
         this(new MockInternationalPrice(), null);
-	}
+    }
 
-    public MockPlanPhase(@Nullable MockInternationalPrice recurringPrice,
-                         @Nullable MockInternationalPrice fixedPrice) {
+    public MockPlanPhase(@Nullable final MockInternationalPrice recurringPrice,
+                         @Nullable final MockInternationalPrice fixedPrice) {
         this(recurringPrice, fixedPrice, BillingPeriod.MONTHLY);
-	}
-
-    public MockPlanPhase(@Nullable MockInternationalPrice recurringPrice,
-                         @Nullable MockInternationalPrice fixedPrice,
-                         BillingPeriod billingPeriod) {
-		this(recurringPrice, fixedPrice, billingPeriod, PhaseType.EVERGREEN);
-	}
-
-    public MockPlanPhase(@Nullable MockInternationalPrice recurringPrice,
-                         @Nullable MockInternationalPrice fixedPrice,
-                         BillingPeriod billingPeriod,
-                         PhaseType phaseType) {
-		setBillingPeriod(billingPeriod);
-		setPhaseType(phaseType);
-		setDuration(new DefaultDuration().setNumber(-1).setUnit(TimeUnit.UNLIMITED));
-		setRecurringPrice(recurringPrice);
-		setFixedPrice(fixedPrice);
-		setPlan(new MockPlan(this));
-	}
-
-	public MockPlanPhase(MockPlan mockPlan) {
-		setBillingPeriod(BillingPeriod.MONTHLY);
-		setPhaseType(PhaseType.EVERGREEN);
-		setDuration(new DefaultDuration().setNumber(-1).setUnit(TimeUnit.UNLIMITED));
-		setRecurringPrice(new MockInternationalPrice());
-		setFixedPrice(null);
-		setPlan(mockPlan);
-	}
-
-    public MockPlanPhase(Plan plan, PhaseType phaseType) {
-		setBillingPeriod(BillingPeriod.MONTHLY);
-		setPhaseType(phaseType);
-		setDuration(new DefaultDuration().setNumber(-1).setUnit(TimeUnit.UNLIMITED));
-		setRecurringPrice(new MockInternationalPrice());
-		setFixedPrice(null);
-		setPlan(plan);
-	}
+    }
+
+    public MockPlanPhase(@Nullable final MockInternationalPrice recurringPrice,
+                         @Nullable final MockInternationalPrice fixedPrice,
+                         final BillingPeriod billingPeriod) {
+        this(recurringPrice, fixedPrice, billingPeriod, PhaseType.EVERGREEN);
+    }
+
+    public MockPlanPhase(@Nullable final MockInternationalPrice recurringPrice,
+                         @Nullable final MockInternationalPrice fixedPrice,
+                         final BillingPeriod billingPeriod,
+                         final PhaseType phaseType) {
+        setBillingPeriod(billingPeriod);
+        setPhaseType(phaseType);
+        setDuration(new DefaultDuration().setNumber(-1).setUnit(TimeUnit.UNLIMITED));
+        setRecurringPrice(recurringPrice);
+        setFixedPrice(fixedPrice);
+        setPlan(new MockPlan(this));
+    }
+
+    public MockPlanPhase(final MockPlan mockPlan) {
+        setBillingPeriod(BillingPeriod.MONTHLY);
+        setPhaseType(PhaseType.EVERGREEN);
+        setDuration(new DefaultDuration().setNumber(-1).setUnit(TimeUnit.UNLIMITED));
+        setRecurringPrice(new MockInternationalPrice());
+        setFixedPrice(null);
+        setPlan(mockPlan);
+    }
+
+    public MockPlanPhase(final Plan plan, final PhaseType phaseType) {
+        setBillingPeriod(BillingPeriod.MONTHLY);
+        setPhaseType(phaseType);
+        setDuration(new DefaultDuration().setNumber(-1).setUnit(TimeUnit.UNLIMITED));
+        setRecurringPrice(new MockInternationalPrice());
+        setFixedPrice(null);
+        setPlan(plan);
+    }
 }

diff --git a/catalog/src/test/java/com/ning/billing/catalog/MockPriceList.java b/catalog/src/test/java/com/ning/billing/catalog/MockPriceList.java
index 9b672ba..f482a93 100644
--- a/catalog/src/test/java/com/ning/billing/catalog/MockPriceList.java
+++ b/catalog/src/test/java/com/ning/billing/catalog/MockPriceList.java
@@ -20,9 +20,9 @@ import com.ning.billing.catalog.api.PriceListSet;
 
 public class MockPriceList extends DefaultPriceList {
 
-	public MockPriceList() {
-		setName(PriceListSet.DEFAULT_PRICELIST_NAME);
-		setRetired(false);
-		setPlans(MockPlan.createAll());
-	}
+    public MockPriceList() {
+        setName(PriceListSet.DEFAULT_PRICELIST_NAME);
+        setRetired(false);
+        setPlans(MockPlan.createAll());
+    }
 }

diff --git a/catalog/src/test/java/com/ning/billing/catalog/MockProduct.java b/catalog/src/test/java/com/ning/billing/catalog/MockProduct.java
index 52ffd91..5e8f0ec 100644
--- a/catalog/src/test/java/com/ning/billing/catalog/MockProduct.java
+++ b/catalog/src/test/java/com/ning/billing/catalog/MockProduct.java
@@ -20,57 +20,56 @@ import com.ning.billing.catalog.api.ProductCategory;
 
 public class MockProduct extends DefaultProduct {
 
-	public MockProduct() {
-		setName("TestProduct");
-		setCatagory(ProductCategory.BASE);
-		setCatalogName("Vehcles");
-	}
-	
-	public MockProduct(String name, ProductCategory category, String catalogName) {
-		setName(name);
-		setCatagory(category);
-		setCatalogName(catalogName);
-	}
-	
-	public static MockProduct createBicycle() {
-		return new MockProduct("Bicycle", ProductCategory.BASE, "Vehcles");
-	}
-	
-	public static MockProduct createPickup() {
-		return new MockProduct("Pickup", ProductCategory.BASE, "Vehcles");
-	}
-	
-	public static MockProduct createSportsCar() {
-		return new MockProduct("SportsCar", ProductCategory.BASE, "Vehcles");
-	}
-	
-	public static MockProduct createJet() {
-		return new MockProduct("Jet", ProductCategory.BASE, "Vehcles");
-	}
-	
-	public static MockProduct createHorn() {
-		return new MockProduct("Horn", ProductCategory.ADD_ON, "Vehcles");
-	}
-	
-	public static MockProduct createSpotlight() {
-		return new MockProduct("spotlight", ProductCategory.ADD_ON, "Vehcles");
-	}
-	
-	public static MockProduct createRedPaintJob() {
-		return new MockProduct("RedPaintJob", ProductCategory.ADD_ON, "Vehcles");
-	}
+    public MockProduct() {
+        setName("TestProduct");
+        setCatagory(ProductCategory.BASE);
+        setCatalogName("Vehcles");
+    }
+
+    public MockProduct(final String name, final ProductCategory category, final String catalogName) {
+        setName(name);
+        setCatagory(category);
+        setCatalogName(catalogName);
+    }
+
+    public static MockProduct createBicycle() {
+        return new MockProduct("Bicycle", ProductCategory.BASE, "Vehcles");
+    }
+
+    public static MockProduct createPickup() {
+        return new MockProduct("Pickup", ProductCategory.BASE, "Vehcles");
+    }
+
+    public static MockProduct createSportsCar() {
+        return new MockProduct("SportsCar", ProductCategory.BASE, "Vehcles");
+    }
+
+    public static MockProduct createJet() {
+        return new MockProduct("Jet", ProductCategory.BASE, "Vehcles");
+    }
+
+    public static MockProduct createHorn() {
+        return new MockProduct("Horn", ProductCategory.ADD_ON, "Vehcles");
+    }
+
+    public static MockProduct createSpotlight() {
+        return new MockProduct("spotlight", ProductCategory.ADD_ON, "Vehcles");
+    }
+
+    public static MockProduct createRedPaintJob() {
+        return new MockProduct("RedPaintJob", ProductCategory.ADD_ON, "Vehcles");
+    }
+
+    public static DefaultProduct[] createAll() {
+        return new MockProduct[]{
+                createBicycle(),
+                createPickup(),
+                createSportsCar(),
+                createJet(),
+                createHorn(),
+                createRedPaintJob()
+        };
+    }
+
 
-	public static DefaultProduct[] createAll() {
-		return new MockProduct[]{
-				createBicycle(),
-				createPickup(),
-				createSportsCar(),
-				createJet(),
-				createHorn(),
-				createRedPaintJob()
-		};
-	}
-	
-	
-	
 }

diff --git a/catalog/src/test/java/com/ning/billing/catalog/rules/MockPlanRules.java b/catalog/src/test/java/com/ning/billing/catalog/rules/MockPlanRules.java
index 1c2eb1c..c998c9b 100644
--- a/catalog/src/test/java/com/ning/billing/catalog/rules/MockPlanRules.java
+++ b/catalog/src/test/java/com/ning/billing/catalog/rules/MockPlanRules.java
@@ -18,16 +18,16 @@ package com.ning.billing.catalog.rules;
 
 public class MockPlanRules extends PlanRules {
 
-	//For test
-	public MockPlanRules(
-			CaseChangePlanPolicy[] changeCase, CaseCancelPolicy[] cancelCase,
-			CaseChangePlanAlignment[] changeAlignmentCase,
-			CaseCreateAlignment[] createAlignmentCase) {
-		super();
-		setChangeCase(changeCase);
-		setCancelCase(cancelCase);
-		setChangeAlignmentCase(changeAlignmentCase);
-		setCreateAlignmentCase(createAlignmentCase);
-	}
+    //For test
+    public MockPlanRules(
+            final CaseChangePlanPolicy[] changeCase, final CaseCancelPolicy[] cancelCase,
+            final CaseChangePlanAlignment[] changeAlignmentCase,
+            final CaseCreateAlignment[] createAlignmentCase) {
+        super();
+        setChangeCase(changeCase);
+        setCancelCase(cancelCase);
+        setChangeAlignmentCase(changeAlignmentCase);
+        setCreateAlignmentCase(createAlignmentCase);
+    }
 
 }

diff --git a/catalog/src/test/java/com/ning/billing/catalog/rules/Result.java b/catalog/src/test/java/com/ning/billing/catalog/rules/Result.java
index ff98d83..0df62d9 100644
--- a/catalog/src/test/java/com/ning/billing/catalog/rules/Result.java
+++ b/catalog/src/test/java/com/ning/billing/catalog/rules/Result.java
@@ -17,5 +17,5 @@
 package com.ning.billing.catalog.rules;
 
 enum Result {
-	FOO, BAR, TINKYWINKY,DIPSY,LALA, PO
-}
\ No newline at end of file
+    FOO, BAR, TINKYWINKY, DIPSY, LALA, PO
+}

diff --git a/catalog/src/test/java/com/ning/billing/catalog/rules/TestCase.java b/catalog/src/test/java/com/ning/billing/catalog/rules/TestCase.java
index 10229ef..5ae3793 100644
--- a/catalog/src/test/java/com/ning/billing/catalog/rules/TestCase.java
+++ b/catalog/src/test/java/com/ning/billing/catalog/rules/TestCase.java
@@ -16,9 +16,6 @@
 
 package com.ning.billing.catalog.rules;
 
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNull;
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlIDREF;
 
@@ -36,15 +33,18 @@ import com.ning.billing.catalog.api.PlanSpecifier;
 import com.ning.billing.catalog.api.PriceListSet;
 import com.ning.billing.catalog.api.ProductCategory;
 
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
+
 public class TestCase {
 
-    protected class CaseResult extends Case<Result>  {
+    protected class CaseResult extends Case<Result> {
 
-        @XmlElement(required=true)
-        private Result policy;
+        @XmlElement(required = true)
+        private final Result policy;
 
-        public CaseResult(DefaultProduct product, ProductCategory productCategory, BillingPeriod billingPeriod, DefaultPriceList priceList,
-                Result policy) {
+        public CaseResult(final DefaultProduct product, final ProductCategory productCategory, final BillingPeriod billingPeriod, final DefaultPriceList priceList,
+                          final Result policy) {
             setProduct(product);
             setProductCategory(productCategory);
             setBillingPeriod(billingPeriod);
@@ -57,20 +57,20 @@ public class TestCase {
             return policy;
         }
 
-        @XmlElement(required=false, name="product")
+        @XmlElement(required = false, name = "product")
         @XmlIDREF
         protected DefaultProduct product;
-        @XmlElement(required=false, name="productCategory")
+        @XmlElement(required = false, name = "productCategory")
         protected ProductCategory productCategory;
 
-        @XmlElement(required=false, name="billingPeriod")
+        @XmlElement(required = false, name = "billingPeriod")
         protected BillingPeriod billingPeriod;
 
-        @XmlElement(required=false, name="priceList")
+        @XmlElement(required = false, name = "priceList")
         @XmlIDREF
         protected DefaultPriceList priceList;
 
-        public DefaultProduct getProduct(){
+        public DefaultProduct getProduct() {
             return product;
         }
 
@@ -86,203 +86,201 @@ public class TestCase {
             return priceList;
         }
 
-        protected CaseResult setProduct(DefaultProduct product) {
+        protected CaseResult setProduct(final DefaultProduct product) {
             this.product = product;
             return this;
         }
 
-        protected CaseResult setProductCategory(ProductCategory productCategory) {
+        protected CaseResult setProductCategory(final ProductCategory productCategory) {
             this.productCategory = productCategory;
             return this;
         }
 
-        protected CaseResult setBillingPeriod(BillingPeriod billingPeriod) {
+        protected CaseResult setBillingPeriod(final BillingPeriod billingPeriod) {
             this.billingPeriod = billingPeriod;
             return this;
         }
 
-        protected CaseResult setPriceList(DefaultPriceList priceList) {
+        protected CaseResult setPriceList(final DefaultPriceList priceList) {
             this.priceList = priceList;
             return this;
         }
     }
 
-    @Test(enabled=true)
-    public void testBasic() throws CatalogApiException{
-        MockCatalog cat = new MockCatalog();
+    @Test(enabled = true)
+    public void testBasic() throws CatalogApiException {
+        final MockCatalog cat = new MockCatalog();
 
-        DefaultProduct product = cat.getCurrentProducts()[0];
-        DefaultPriceList priceList = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
+        final DefaultProduct product = cat.getCurrentProducts()[0];
+        final DefaultPriceList priceList = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
 
 
-        CaseResult cr = new CaseResult(
-                product, 
+        final CaseResult cr = new CaseResult(
+                product,
                 ProductCategory.BASE,
-                BillingPeriod.MONTHLY, 
+                BillingPeriod.MONTHLY,
                 priceList,
                 Result.FOO);
 
         assertion(Result.FOO, cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), cat);
         assertionNull(cr, cat.getCurrentProducts()[1].getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), cat);
-        assertionNull(cr, product.getName(), ProductCategory.ADD_ON,BillingPeriod.MONTHLY, priceList.getName(), cat);
-        assertionNull(cr, product.getName(), ProductCategory.BASE,BillingPeriod.ANNUAL, priceList.getName(), cat);
-        assertionException(cr, product.getName(), ProductCategory.BASE,BillingPeriod.MONTHLY, "dipsy", cat);
+        assertionNull(cr, product.getName(), ProductCategory.ADD_ON, BillingPeriod.MONTHLY, priceList.getName(), cat);
+        assertionNull(cr, product.getName(), ProductCategory.BASE, BillingPeriod.ANNUAL, priceList.getName(), cat);
+        assertionException(cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, "dipsy", cat);
     }
 
-    @Test(enabled=true)
-    public void testWildCardProduct() throws CatalogApiException{
-        MockCatalog cat = new MockCatalog();
+    @Test(enabled = true)
+    public void testWildCardProduct() throws CatalogApiException {
+        final MockCatalog cat = new MockCatalog();
 
-        DefaultProduct product = cat.getCurrentProducts()[0];
-        DefaultPriceList priceList = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
+        final DefaultProduct product = cat.getCurrentProducts()[0];
+        final DefaultPriceList priceList = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
 
 
-        CaseResult cr = new CaseResult(
-                null, 
+        final CaseResult cr = new CaseResult(
+                null,
                 ProductCategory.BASE,
-                BillingPeriod.MONTHLY, 
+                BillingPeriod.MONTHLY,
                 priceList,
 
                 Result.FOO);
 
-        assertion(Result.FOO, cr, product.getName(), ProductCategory.BASE,BillingPeriod.MONTHLY, priceList.getName(), cat);
-        assertion(Result.FOO, cr, cat.getCurrentProducts()[1].getName(), ProductCategory.BASE,BillingPeriod.MONTHLY, priceList.getName(), cat);
-        assertionNull(cr, product.getName(), ProductCategory.ADD_ON,BillingPeriod.MONTHLY, priceList.getName(), cat);
-        assertionNull(cr, product.getName(), ProductCategory.BASE,BillingPeriod.ANNUAL, priceList.getName(), cat);
-        assertionException(cr, product.getName(), ProductCategory.BASE,BillingPeriod.MONTHLY, "dipsy", cat);
+        assertion(Result.FOO, cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), cat);
+        assertion(Result.FOO, cr, cat.getCurrentProducts()[1].getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), cat);
+        assertionNull(cr, product.getName(), ProductCategory.ADD_ON, BillingPeriod.MONTHLY, priceList.getName(), cat);
+        assertionNull(cr, product.getName(), ProductCategory.BASE, BillingPeriod.ANNUAL, priceList.getName(), cat);
+        assertionException(cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, "dipsy", cat);
     }
 
-    @Test(enabled=true)
-    public void testWildCardProductCategory() throws CatalogApiException{
-        MockCatalog cat = new MockCatalog();
+    @Test(enabled = true)
+    public void testWildCardProductCategory() throws CatalogApiException {
+        final MockCatalog cat = new MockCatalog();
 
-        DefaultProduct product = cat.getCurrentProducts()[0];
-        DefaultPriceList priceList = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
+        final DefaultProduct product = cat.getCurrentProducts()[0];
+        final DefaultPriceList priceList = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
 
 
-        CaseResult cr = new CaseResult(
-                product, 
+        final CaseResult cr = new CaseResult(
+                product,
                 null,
-                BillingPeriod.MONTHLY, 
+                BillingPeriod.MONTHLY,
                 priceList,
 
                 Result.FOO);
 
         assertion(Result.FOO, cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), cat);
-        assertionNull(cr,  cat.getCurrentProducts()[1].getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), cat);
-        assertion(Result.FOO, cr, product.getName(), ProductCategory.ADD_ON,BillingPeriod.MONTHLY, priceList.getName(), cat);
-        assertionNull(cr, product.getName(), ProductCategory.BASE,BillingPeriod.ANNUAL, priceList.getName(), cat);
-        assertionException(cr, product.getName(), ProductCategory.BASE,BillingPeriod.MONTHLY, "dipsy", cat);
+        assertionNull(cr, cat.getCurrentProducts()[1].getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), cat);
+        assertion(Result.FOO, cr, product.getName(), ProductCategory.ADD_ON, BillingPeriod.MONTHLY, priceList.getName(), cat);
+        assertionNull(cr, product.getName(), ProductCategory.BASE, BillingPeriod.ANNUAL, priceList.getName(), cat);
+        assertionException(cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, "dipsy", cat);
     }
 
-    @Test(enabled=true)
-    public void testWildCardBillingPeriod() throws CatalogApiException{
-        MockCatalog cat = new MockCatalog();
+    @Test(enabled = true)
+    public void testWildCardBillingPeriod() throws CatalogApiException {
+        final MockCatalog cat = new MockCatalog();
 
-        DefaultProduct product = cat.getCurrentProducts()[0];
-        DefaultPriceList priceList = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
+        final DefaultProduct product = cat.getCurrentProducts()[0];
+        final DefaultPriceList priceList = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
 
 
-        CaseResult cr = new CaseResult(
-                product, 
+        final CaseResult cr = new CaseResult(
+                product,
                 ProductCategory.BASE,
-                null, 
+                null,
                 priceList,
 
                 Result.FOO);
 
         assertion(Result.FOO, cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), cat);
-        assertionNull(cr,  cat.getCurrentProducts()[1].getName(), ProductCategory.BASE,BillingPeriod.MONTHLY, priceList.getName(), cat);
-        assertionNull(cr, product.getName(), ProductCategory.ADD_ON,BillingPeriod.MONTHLY, priceList.getName(), cat);
-        assertion(Result.FOO,cr, product.getName(), ProductCategory.BASE,BillingPeriod.ANNUAL, priceList.getName(), cat);
-        assertionException(cr, product.getName(), ProductCategory.BASE,BillingPeriod.MONTHLY, "dipsy", cat);
+        assertionNull(cr, cat.getCurrentProducts()[1].getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), cat);
+        assertionNull(cr, product.getName(), ProductCategory.ADD_ON, BillingPeriod.MONTHLY, priceList.getName(), cat);
+        assertion(Result.FOO, cr, product.getName(), ProductCategory.BASE, BillingPeriod.ANNUAL, priceList.getName(), cat);
+        assertionException(cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, "dipsy", cat);
     }
 
-    @Test(enabled=true)
-    public void testWildCardPriceList() throws CatalogApiException{
-        MockCatalog cat = new MockCatalog();
+    @Test(enabled = true)
+    public void testWildCardPriceList() throws CatalogApiException {
+        final MockCatalog cat = new MockCatalog();
 
-        DefaultProduct product = cat.getCurrentProducts()[0];
-        DefaultPriceList priceList = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
+        final DefaultProduct product = cat.getCurrentProducts()[0];
+        final DefaultPriceList priceList = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
 
 
-        CaseResult cr = new CaseResult(
-                product, 
+        final CaseResult cr = new CaseResult(
+                product,
                 ProductCategory.BASE,
-                BillingPeriod.MONTHLY, 
+                BillingPeriod.MONTHLY,
                 null,
 
                 Result.FOO);
 
-        assertion(Result.FOO, cr, product.getName(), ProductCategory.BASE,BillingPeriod.MONTHLY, priceList.getName(), cat);
-        assertionNull(cr,  cat.getCurrentProducts()[1].getName(), ProductCategory.BASE,BillingPeriod.MONTHLY, priceList.getName(), cat);
-        assertionNull(cr, product.getName(), ProductCategory.ADD_ON,BillingPeriod.MONTHLY, priceList.getName(), cat);
-        assertionNull(cr, product.getName(), ProductCategory.BASE,BillingPeriod.ANNUAL, priceList.getName(), cat);
-        assertion(Result.FOO, cr, product.getName(), ProductCategory.BASE,BillingPeriod.MONTHLY, "dipsy", cat);
+        assertion(Result.FOO, cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), cat);
+        assertionNull(cr, cat.getCurrentProducts()[1].getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), cat);
+        assertionNull(cr, product.getName(), ProductCategory.ADD_ON, BillingPeriod.MONTHLY, priceList.getName(), cat);
+        assertionNull(cr, product.getName(), ProductCategory.BASE, BillingPeriod.ANNUAL, priceList.getName(), cat);
+        assertion(Result.FOO, cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, "dipsy", cat);
     }
 
     @Test
     public void testCaseOrder() throws CatalogApiException {
-        MockCatalog cat = new MockCatalog();
+        final MockCatalog cat = new MockCatalog();
 
-        DefaultProduct product = cat.getCurrentProducts()[0];
-        DefaultPriceList priceList = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
+        final DefaultProduct product = cat.getCurrentProducts()[0];
+        final DefaultPriceList priceList = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
 
 
-        CaseResult cr0 = new CaseResult(
-                product, 
+        final CaseResult cr0 = new CaseResult(
+                product,
                 ProductCategory.BASE,
-                BillingPeriod.MONTHLY, 
+                BillingPeriod.MONTHLY,
                 priceList,
                 Result.FOO);
 
-        CaseResult cr1 = new CaseResult(
-                product, 
+        final CaseResult cr1 = new CaseResult(
+                product,
                 ProductCategory.BASE,
-                BillingPeriod.MONTHLY, 
+                BillingPeriod.MONTHLY,
                 priceList,
                 Result.BAR);
 
-        CaseResult cr2 = new CaseResult(
-                product, 
+        final CaseResult cr2 = new CaseResult(
+                product,
                 ProductCategory.BASE,
-                BillingPeriod.ANNUAL, 
+                BillingPeriod.ANNUAL,
                 priceList,
                 Result.DIPSY);
 
-        CaseResult cr3 = new CaseResult(
-                product, 
+        final CaseResult cr3 = new CaseResult(
+                product,
                 ProductCategory.BASE,
-                BillingPeriod.ANNUAL, 
+                BillingPeriod.ANNUAL,
                 priceList,
                 Result.LALA);
 
-        Result r1 = Case.getResult(new CaseResult[]{cr0, cr1, cr2,cr3}, 
-                new PlanSpecifier(product.getName(), product.getCategory(), BillingPeriod.MONTHLY, priceList.getName()), cat);
+        final Result r1 = Case.getResult(new CaseResult[]{cr0, cr1, cr2, cr3},
+                                   new PlanSpecifier(product.getName(), product.getCategory(), BillingPeriod.MONTHLY, priceList.getName()), cat);
         assertEquals(Result.FOO, r1);
 
-        Result r2 = Case.getResult(new CaseResult[]{cr0, cr1, cr2}, 
-                new PlanSpecifier(product.getName(), product.getCategory(), BillingPeriod.ANNUAL, priceList.getName()), cat);
+        final Result r2 = Case.getResult(new CaseResult[]{cr0, cr1, cr2},
+                                   new PlanSpecifier(product.getName(), product.getCategory(), BillingPeriod.ANNUAL, priceList.getName()), cat);
         assertEquals(Result.DIPSY, r2);
     }
 
 
-
-
-    protected void assertionNull(CaseResult cr, String productName, ProductCategory productCategory, BillingPeriod bp, String priceListName, StandaloneCatalog cat) throws CatalogApiException{
+    protected void assertionNull(final CaseResult cr, final String productName, final ProductCategory productCategory, final BillingPeriod bp, final String priceListName, final StandaloneCatalog cat) throws CatalogApiException {
         assertNull(cr.getResult(new PlanSpecifier(productName, productCategory, bp, priceListName), cat));
     }
 
-    protected void assertionException(CaseResult cr, String productName, ProductCategory productCategory, BillingPeriod bp, String priceListName, StandaloneCatalog cat) {
-        try{
-        	cr.getResult(new PlanSpecifier(productName, productCategory, bp, priceListName), cat);  	
-        	Assert.fail("Expecting an exception");
+    protected void assertionException(final CaseResult cr, final String productName, final ProductCategory productCategory, final BillingPeriod bp, final String priceListName, final StandaloneCatalog cat) {
+        try {
+            cr.getResult(new PlanSpecifier(productName, productCategory, bp, priceListName), cat);
+            Assert.fail("Expecting an exception");
         } catch (CatalogApiException e) {
-        	Assert.assertEquals(e.getCode(), ErrorCode.CAT_PRICE_LIST_NOT_FOUND.getCode());
+            Assert.assertEquals(e.getCode(), ErrorCode.CAT_PRICE_LIST_NOT_FOUND.getCode());
         }
     }
 
-    protected void assertion(Result result, CaseResult cr, String productName, ProductCategory productCategory, BillingPeriod bp, String priceListName,StandaloneCatalog cat) throws CatalogApiException{
+    protected void assertion(final Result result, final CaseResult cr, final String productName, final ProductCategory productCategory, final BillingPeriod bp, final String priceListName, final StandaloneCatalog cat) throws CatalogApiException {
         assertEquals(result, cr.getResult(new PlanSpecifier(productName, productCategory, bp, priceListName), cat));
     }
 

diff --git a/catalog/src/test/java/com/ning/billing/catalog/rules/TestCaseChange.java b/catalog/src/test/java/com/ning/billing/catalog/rules/TestCaseChange.java
index ef1eb17..a52b02c 100644
--- a/catalog/src/test/java/com/ning/billing/catalog/rules/TestCaseChange.java
+++ b/catalog/src/test/java/com/ning/billing/catalog/rules/TestCaseChange.java
@@ -16,12 +16,16 @@
 
 package com.ning.billing.catalog.rules;
 
+import javax.xml.bind.annotation.XmlElement;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
 import com.ning.billing.ErrorCode;
 import com.ning.billing.catalog.DefaultPriceList;
 import com.ning.billing.catalog.DefaultProduct;
 import com.ning.billing.catalog.MockCatalog;
 import com.ning.billing.catalog.StandaloneCatalog;
-
 import com.ning.billing.catalog.api.BillingPeriod;
 import com.ning.billing.catalog.api.CatalogApiException;
 import com.ning.billing.catalog.api.PhaseType;
@@ -29,1044 +33,1043 @@ import com.ning.billing.catalog.api.PlanPhaseSpecifier;
 import com.ning.billing.catalog.api.PlanSpecifier;
 import com.ning.billing.catalog.api.PriceListSet;
 import com.ning.billing.catalog.api.ProductCategory;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import javax.xml.bind.annotation.XmlElement;
 
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNull;
 
 public class TestCaseChange {
-	protected static class CaseChangeResult extends CaseChange<Result>  {
-
-		@XmlElement(required=true)
-		private Result result;
-
-		public CaseChangeResult(DefaultProduct from, DefaultProduct to, 
-				ProductCategory fromProductCategory, ProductCategory toProductCategory,
-				BillingPeriod fromBP, BillingPeriod toBP,
-				DefaultPriceList fromPriceList, DefaultPriceList toPriceList,
-				PhaseType fromType,
-				Result result) {
-			setFromProduct(from);
-			setToProduct(to);
-			setFromProductCategory(fromProductCategory);
-			setToProductCategory(toProductCategory);
-			setFromPriceList(fromPriceList);
-			setToPriceList(toPriceList);
-			setFromBillingPeriod(fromBP);
-			setToBillingPeriod(toBP);
-			setPhaseType(fromType);
-			
-			this.result = result;
-		}
-
-		@Override
-		protected Result getResult() {
-			return result;
-		}
-	}
-	@Test(enabled=true)
-	public void testBasic() throws CatalogApiException {
-		MockCatalog cat = new MockCatalog();
-
-		DefaultProduct product1 = cat.getCurrentProducts()[0];
-		DefaultPriceList priceList1 = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
-
-		DefaultProduct product2 = cat.getCurrentProducts()[2];
-		DefaultPriceList priceList2 = cat.getPriceLists().getChildPriceLists()[1];
-
-
-		CaseChangeResult cr = new CaseChangeResult(
-				product1, product2,
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1,priceList2,
-				PhaseType.EVERGREEN,
-				Result.FOO);
-
-		assertion(Result.FOO, cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				 cat.getCurrentProducts()[1].getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(),  cat.getCurrentProducts()[1].getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull( cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.ADD_ON, ProductCategory.BASE,				
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull( cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.ADD_ON,				
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.ANNUAL, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.ANNUAL, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionException(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				 cat.getCurrentProducts()[1].getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionException(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(),  cat.getCurrentProducts()[1].getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.TRIAL, cat);	
-	}
-	
-	@Test(enabled=true)
-	public void testWildcardFromProduct()throws CatalogApiException{
-		MockCatalog cat = new MockCatalog();
-
-		DefaultProduct product1 = cat.getCurrentProducts()[0];
-		DefaultPriceList priceList1 = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
-
-		DefaultProduct product2 = cat.getCurrentProducts()[2];
-		DefaultPriceList priceList2 = cat.getPriceLists().getChildPriceLists()[1];
-
-
-		CaseChangeResult cr = new CaseChangeResult(
-				null, product2,
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1,priceList2,
-				PhaseType.EVERGREEN,
-				Result.FOO);
-
-		assertion(Result.FOO, cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertion(Result.FOO,cr, 
-				 cat.getCurrentProducts()[1].getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-			
-		assertionNull( cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.ADD_ON, ProductCategory.BASE,				
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull( cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.ADD_ON,				
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-
-		assertionNull(cr, 
-				product1.getName(),  cat.getCurrentProducts()[1].getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.ANNUAL, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.ANNUAL, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionException(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				 cat.getCurrentProducts()[1].getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionException(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(),  cat.getCurrentProducts()[1].getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.TRIAL, cat);	
-	}
-	
-	@Test(enabled=true)
-	public void testWildcardToProduct() throws CatalogApiException{
-		MockCatalog cat = new MockCatalog();
-
-		DefaultProduct product1 = cat.getCurrentProducts()[0];
-		DefaultPriceList priceList1 = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
-
-		DefaultProduct product2 = cat.getCurrentProducts()[2];
-		DefaultPriceList priceList2 = cat.getPriceLists().getChildPriceLists()[1];
-
-
-		CaseChangeResult cr = new CaseChangeResult(
-				product1, null,
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1,priceList2,
-				PhaseType.EVERGREEN,
-				Result.FOO);
-
-		assertion(Result.FOO, cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				 cat.getCurrentProducts()[1].getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull( cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.ADD_ON, ProductCategory.BASE,				
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull( cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.ADD_ON,				
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertion(Result.FOO, cr, 
-				product1.getName(),  cat.getCurrentProducts()[1].getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.ANNUAL, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.ANNUAL, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionException(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				 cat.getCurrentProducts()[1].getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionException(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(),  cat.getCurrentProducts()[1].getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.TRIAL, cat);	
-	}
-	
-	@Test(enabled=true)
-	public void testWildcardFromProductCategory() throws CatalogApiException{
-		MockCatalog cat = new MockCatalog();
-
-		DefaultProduct product1 = cat.getCurrentProducts()[0];
-		DefaultPriceList priceList1 = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
-
-		DefaultProduct product2 = cat.getCurrentProducts()[2];
-		DefaultPriceList priceList2 = cat.getPriceLists().getChildPriceLists()[1];
-
-
-		CaseChangeResult cr = new CaseChangeResult(
-				product1, product2,
-				null, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1,priceList2,
-				PhaseType.EVERGREEN,
-				Result.FOO);
-
-		assertion(Result.FOO, cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				 cat.getCurrentProducts()[1].getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(),  cat.getCurrentProducts()[1].getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertion(Result.FOO, cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.ADD_ON, ProductCategory.BASE,				
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull( cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.ADD_ON,				
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.ANNUAL, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.ANNUAL, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionException(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				 cat.getCurrentProducts()[1].getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionException(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(),  cat.getCurrentProducts()[1].getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.TRIAL, cat);	
-	}
-	
-	@Test(enabled=true)
-	public void testWildcardToProductCategory() throws CatalogApiException{
-		MockCatalog cat = new MockCatalog();
-
-		DefaultProduct product1 = cat.getCurrentProducts()[0];
-		DefaultPriceList priceList1 = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
-
-		DefaultProduct product2 = cat.getCurrentProducts()[2];
-		DefaultPriceList priceList2 = cat.getPriceLists().getChildPriceLists()[1];
-
-
-		CaseChangeResult cr = new CaseChangeResult(
-				product1, product2,
-				ProductCategory.BASE, null,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1,priceList2,
-				PhaseType.EVERGREEN,
-				Result.FOO);
-
-		assertion(Result.FOO, cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				 cat.getCurrentProducts()[1].getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(),  cat.getCurrentProducts()[1].getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull( cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.ADD_ON, ProductCategory.BASE,				
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertion(Result.FOO, cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.ADD_ON,				
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.ANNUAL, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.ANNUAL, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionException(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				 cat.getCurrentProducts()[1].getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionException(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(),  cat.getCurrentProducts()[1].getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.TRIAL, cat);	
-	}
-	
-	@Test(enabled=true)
-	public void testWildcardFromBillingPeriod() throws CatalogApiException{
-		MockCatalog cat = new MockCatalog();
-
-		DefaultProduct product1 = cat.getCurrentProducts()[0];
-		DefaultPriceList priceList1 = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
-
-		DefaultProduct product2 = cat.getCurrentProducts()[2];
-		DefaultPriceList priceList2 = cat.getPriceLists().getChildPriceLists()[1];
-
-
-		CaseChangeResult cr = new CaseChangeResult(
-				product1, product2,
-				ProductCategory.BASE, ProductCategory.BASE,
-				null, BillingPeriod.MONTHLY, 
-				priceList1, priceList2,
-				PhaseType.EVERGREEN,
-				Result.FOO);
-
-		assertion(Result.FOO, cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				 cat.getCurrentProducts()[1].getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull( cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.ADD_ON, ProductCategory.BASE,				
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull( cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.ADD_ON,				
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(),  cat.getCurrentProducts()[1].getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertion(Result.FOO,cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.ANNUAL, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.ANNUAL, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionException(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				 cat.getCurrentProducts()[1].getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionException(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(),  cat.getCurrentProducts()[1].getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.TRIAL, cat);	
-	}
-	
-	
-	@Test(enabled=true)
-	public void testWildCardToBillingPeriod() throws CatalogApiException{
-		MockCatalog cat = new MockCatalog();
-
-		DefaultProduct product1 = cat.getCurrentProducts()[0];
-		DefaultPriceList priceList1 = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
-
-		DefaultProduct product2 = cat.getCurrentProducts()[2];
-		DefaultPriceList priceList2 = cat.getPriceLists().getChildPriceLists()[1];
-
-
-		CaseChangeResult cr = new CaseChangeResult(
-				product1, product2,
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, null, 
-				priceList1,priceList2,
-				PhaseType.EVERGREEN,
-				Result.FOO);
-
-		assertion(Result.FOO, cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				 cat.getCurrentProducts()[1].getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull( cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.ADD_ON, ProductCategory.BASE,				
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull( cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.ADD_ON,				
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(),  cat.getCurrentProducts()[1].getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.ANNUAL, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertion(Result.FOO,cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.ANNUAL, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionException(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				 cat.getCurrentProducts()[1].getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionException(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(),  cat.getCurrentProducts()[1].getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.TRIAL, cat);	
-	}
-	
-	@Test(enabled=true)
-	public void testWildCardFromPriceList() throws CatalogApiException{
-		MockCatalog cat = new MockCatalog();
-
-		DefaultProduct product1 = cat.getCurrentProducts()[0];
-		DefaultPriceList priceList1 = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
-
-		DefaultProduct product2 = cat.getCurrentProducts()[2];
-		DefaultPriceList priceList2 = cat.getPriceLists().getChildPriceLists()[1];
-
-
-		CaseChangeResult cr = new CaseChangeResult(
-				product1, product2,
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				null,priceList2,
-				PhaseType.EVERGREEN,
-				Result.FOO);
-
-		assertion(Result.FOO, cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				 cat.getCurrentProducts()[1].getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull( cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.ADD_ON, ProductCategory.BASE,				
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull( cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.ADD_ON,				
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(),  cat.getCurrentProducts()[1].getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.ANNUAL, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.ANNUAL, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertion(Result.FOO,cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				 cat.getCurrentProducts()[1].getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionException(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(),  cat.getCurrentProducts()[1].getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.TRIAL, cat);	
-	}
-	
-	@Test(enabled=true)
-	public void testWildcardToPriceList() throws CatalogApiException{
-		MockCatalog cat = new MockCatalog();
-
-		DefaultProduct product1 = cat.getCurrentProducts()[0];
-		DefaultPriceList priceList1 = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
-
-		DefaultProduct product2 = cat.getCurrentProducts()[2];
-		DefaultPriceList priceList2 = cat.getPriceLists().getChildPriceLists()[1];
-
-
-		CaseChangeResult cr = new CaseChangeResult(
-				product1, product2,
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1,null,
-				PhaseType.EVERGREEN,
-				Result.FOO);
-
-		assertion(Result.FOO, cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				 cat.getCurrentProducts()[1].getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull( cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.ADD_ON, ProductCategory.BASE,				
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull( cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.ADD_ON,				
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(),  cat.getCurrentProducts()[1].getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.ANNUAL, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.ANNUAL, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionException(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				 cat.getCurrentProducts()[1].getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertion(Result.FOO,cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(),  cat.getCurrentProducts()[1].getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.TRIAL, cat);	
-	}
-	
-	@Test(enabled=true)
-	public void testWildcardPlanPhase() throws CatalogApiException{
-		MockCatalog cat = new MockCatalog();
-
-		DefaultProduct product1 = cat.getCurrentProducts()[0];
-		DefaultPriceList priceList1 = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
-
-		DefaultProduct product2 = cat.getCurrentProducts()[2];
-		DefaultPriceList priceList2 = cat.getPriceLists().getChildPriceLists()[1];
-
-
-		CaseChangeResult cr = new CaseChangeResult(
-				product1, product2,
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1,priceList2,
-				null,
-				Result.FOO);
-
-		assertion(Result.FOO, cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				 cat.getCurrentProducts()[1].getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull( cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.ADD_ON, ProductCategory.BASE,				
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull( cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.ADD_ON,				
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(),  cat.getCurrentProducts()[1].getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.ANNUAL, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionNull(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.ANNUAL, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionException(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				 cat.getCurrentProducts()[1].getName(), priceList2.getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertionException(cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(),  cat.getCurrentProducts()[1].getName(), 
-				PhaseType.EVERGREEN, cat);
-		
-		assertion(Result.FOO,cr, 
-				product1.getName(), product2.getName(), 
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1.getName(), priceList2.getName(), 
-				PhaseType.TRIAL, cat);	
-	}
-	
-	
-	@Test(enabled=true)
-	public void testOrder() throws CatalogApiException{
-		MockCatalog cat = new MockCatalog();
-
-		DefaultProduct product1 = cat.getCurrentProducts()[0];
-		DefaultPriceList priceList1 = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
-
-		DefaultProduct product2 = cat.getCurrentProducts()[2];
-		DefaultPriceList priceList2 = cat.getPriceLists().getChildPriceLists()[1];
-
-
-		CaseChangeResult cr0 = new CaseChangeResult(
-				product1, product2,
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1,priceList2,
-				PhaseType.EVERGREEN,
-				Result.FOO);
-
-		CaseChangeResult cr1 = new CaseChangeResult(
-				product1, product2,
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1,priceList2,
-				PhaseType.EVERGREEN,
-				Result.BAR);
-
-		CaseChangeResult cr2 = new CaseChangeResult(
-				product1, product2,
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.MONTHLY, 
-				priceList1,priceList2,
-				PhaseType.EVERGREEN,
-				Result.TINKYWINKY);
-
-		CaseChangeResult cr3 = new CaseChangeResult(
-				product1, product2,
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.ANNUAL, 
-				priceList1,priceList2,
-				PhaseType.EVERGREEN,
-				Result.DIPSY);
-
-		CaseChangeResult cr4 = new CaseChangeResult(
-				product1, product2,
-				ProductCategory.BASE, ProductCategory.BASE,
-				BillingPeriod.MONTHLY, BillingPeriod.ANNUAL, 
-				priceList1,priceList2,
-				PhaseType.EVERGREEN,
-				Result.LALA);
-		
-		Result r1 = CaseChange.getResult(new CaseChangeResult[]{ cr0, cr1, cr2, cr3, cr4 }, 
-				new PlanPhaseSpecifier(product1.getName(), product1.getCategory(), BillingPeriod.MONTHLY, priceList1.getName(), PhaseType.EVERGREEN), 
-				new PlanSpecifier(product2.getName(), product2.getCategory(), BillingPeriod.MONTHLY, priceList2.getName()), cat);
-
-		assertEquals(Result.FOO,r1);
-		
-		Result r2 = CaseChange.getResult(new CaseChangeResult[]{ cr0, cr1, cr2, cr3, cr4 }, 
-				new PlanPhaseSpecifier(product1.getName(), product1.getCategory(), BillingPeriod.MONTHLY, priceList1.getName(), PhaseType.EVERGREEN), 
-				new PlanSpecifier(product2.getName(), product2.getCategory(), BillingPeriod.ANNUAL, priceList2.getName()), cat);
-
-		assertEquals(Result.DIPSY,r2);
-		
-	}
-	
-	
-	protected void assertionNull(CaseChangeResult cr, 
-			String fromProductName, String toProductName,
-			ProductCategory fromProductCategory, ProductCategory toProductCategory, 
-			BillingPeriod fromBp, BillingPeriod toBp,
-			String fromPriceListName, String toPriceListName,
-			PhaseType phaseType, StandaloneCatalog cat){
-		try {
-			assertNull(cr.getResult(new PlanPhaseSpecifier(fromProductName, fromProductCategory, fromBp, fromPriceListName, phaseType), 
-									new PlanSpecifier(toProductName, toProductCategory, toBp, toPriceListName),cat));
-		} catch (CatalogApiException e) {
-			Assert.fail("", e);
-		}
-	}
-	   protected void assertionException(CaseChangeResult cr, 
-				String fromProductName, String toProductName,
-				ProductCategory fromProductCategory, ProductCategory toProductCategory, 
-				BillingPeriod fromBp, BillingPeriod toBp,
-				String fromPriceListName, String toPriceListName,
-				PhaseType phaseType, StandaloneCatalog cat){
-	        try{
-	        	cr.getResult(new PlanPhaseSpecifier(fromProductName, fromProductCategory, fromBp, fromPriceListName, phaseType),
-						new PlanSpecifier(toProductName, toProductCategory, toBp, toPriceListName),cat);
-	        	Assert.fail("Expecting an exception");
-	        } catch (CatalogApiException e) {
-	        	Assert.assertEquals(e.getCode(), ErrorCode.CAT_PRICE_LIST_NOT_FOUND.getCode());
-	        }
-	    }
-	protected void assertion(Result result, CaseChangeResult cr, 
-			String fromProductName, String toProductName,
-			ProductCategory fromProductCategory, ProductCategory toProductCategory, 
-			BillingPeriod fromBp, BillingPeriod toBp,
-			String fromPriceListName, String toPriceListName,
-			PhaseType phaseType, StandaloneCatalog cat){
-		try {
-			assertEquals(result, cr.getResult(new PlanPhaseSpecifier(fromProductName, fromProductCategory,fromBp, fromPriceListName, phaseType), 
-					new PlanSpecifier(toProductName, toProductCategory, toBp, toPriceListName),cat));
-		} catch (CatalogApiException e) {
-			Assert.fail("", e);
-		}
-	}
+    protected static class CaseChangeResult extends CaseChange<Result> {
+
+        @XmlElement(required = true)
+        private final Result result;
+
+        public CaseChangeResult(final DefaultProduct from, final DefaultProduct to,
+                                final ProductCategory fromProductCategory, final ProductCategory toProductCategory,
+                                final BillingPeriod fromBP, final BillingPeriod toBP,
+                                final DefaultPriceList fromPriceList, final DefaultPriceList toPriceList,
+                                final PhaseType fromType,
+                                final Result result) {
+            setFromProduct(from);
+            setToProduct(to);
+            setFromProductCategory(fromProductCategory);
+            setToProductCategory(toProductCategory);
+            setFromPriceList(fromPriceList);
+            setToPriceList(toPriceList);
+            setFromBillingPeriod(fromBP);
+            setToBillingPeriod(toBP);
+            setPhaseType(fromType);
+
+            this.result = result;
+        }
+
+        @Override
+        protected Result getResult() {
+            return result;
+        }
+    }
+
+    @Test(enabled = true)
+    public void testBasic() throws CatalogApiException {
+        final MockCatalog cat = new MockCatalog();
+
+        final DefaultProduct product1 = cat.getCurrentProducts()[0];
+        final DefaultPriceList priceList1 = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
+
+        final DefaultProduct product2 = cat.getCurrentProducts()[2];
+        final DefaultPriceList priceList2 = cat.getPriceLists().getChildPriceLists()[1];
+
+
+        final CaseChangeResult cr = new CaseChangeResult(
+                product1, product2,
+                ProductCategory.BASE, ProductCategory.BASE,
+                BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                priceList1, priceList2,
+                PhaseType.EVERGREEN,
+                Result.FOO);
+
+        assertion(Result.FOO, cr,
+                  product1.getName(), product2.getName(),
+                  ProductCategory.BASE, ProductCategory.BASE,
+                  BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                  priceList1.getName(), priceList2.getName(),
+                  PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      cat.getCurrentProducts()[1].getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), cat.getCurrentProducts()[1].getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.ADD_ON, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.ADD_ON,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.ANNUAL, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.ANNUAL,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionException(cr,
+                           product1.getName(), product2.getName(),
+                           ProductCategory.BASE, ProductCategory.BASE,
+                           BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                           cat.getCurrentProducts()[1].getName(), priceList2.getName(),
+                           PhaseType.EVERGREEN, cat);
+
+        assertionException(cr,
+                           product1.getName(), product2.getName(),
+                           ProductCategory.BASE, ProductCategory.BASE,
+                           BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                           priceList1.getName(), cat.getCurrentProducts()[1].getName(),
+                           PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.TRIAL, cat);
+    }
+
+    @Test(enabled = true)
+    public void testWildcardFromProduct() throws CatalogApiException {
+        final MockCatalog cat = new MockCatalog();
+
+        final DefaultProduct product1 = cat.getCurrentProducts()[0];
+        final DefaultPriceList priceList1 = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
+
+        final DefaultProduct product2 = cat.getCurrentProducts()[2];
+        final DefaultPriceList priceList2 = cat.getPriceLists().getChildPriceLists()[1];
+
+
+        final CaseChangeResult cr = new CaseChangeResult(
+                null, product2,
+                ProductCategory.BASE, ProductCategory.BASE,
+                BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                priceList1, priceList2,
+                PhaseType.EVERGREEN,
+                Result.FOO);
+
+        assertion(Result.FOO, cr,
+                  product1.getName(), product2.getName(),
+                  ProductCategory.BASE, ProductCategory.BASE,
+                  BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                  priceList1.getName(), priceList2.getName(),
+                  PhaseType.EVERGREEN, cat);
+
+        assertion(Result.FOO, cr,
+                  cat.getCurrentProducts()[1].getName(), product2.getName(),
+                  ProductCategory.BASE, ProductCategory.BASE,
+                  BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                  priceList1.getName(), priceList2.getName(),
+                  PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.ADD_ON, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.ADD_ON,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), cat.getCurrentProducts()[1].getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.ANNUAL, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.ANNUAL,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionException(cr,
+                           product1.getName(), product2.getName(),
+                           ProductCategory.BASE, ProductCategory.BASE,
+                           BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                           cat.getCurrentProducts()[1].getName(), priceList2.getName(),
+                           PhaseType.EVERGREEN, cat);
+
+        assertionException(cr,
+                           product1.getName(), product2.getName(),
+                           ProductCategory.BASE, ProductCategory.BASE,
+                           BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                           priceList1.getName(), cat.getCurrentProducts()[1].getName(),
+                           PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.TRIAL, cat);
+    }
+
+    @Test(enabled = true)
+    public void testWildcardToProduct() throws CatalogApiException {
+        final MockCatalog cat = new MockCatalog();
+
+        final DefaultProduct product1 = cat.getCurrentProducts()[0];
+        final DefaultPriceList priceList1 = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
+
+        final DefaultProduct product2 = cat.getCurrentProducts()[2];
+        final DefaultPriceList priceList2 = cat.getPriceLists().getChildPriceLists()[1];
+
+
+        final CaseChangeResult cr = new CaseChangeResult(
+                product1, null,
+                ProductCategory.BASE, ProductCategory.BASE,
+                BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                priceList1, priceList2,
+                PhaseType.EVERGREEN,
+                Result.FOO);
+
+        assertion(Result.FOO, cr,
+                  product1.getName(), product2.getName(),
+                  ProductCategory.BASE, ProductCategory.BASE,
+                  BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                  priceList1.getName(), priceList2.getName(),
+                  PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      cat.getCurrentProducts()[1].getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.ADD_ON, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.ADD_ON,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertion(Result.FOO, cr,
+                  product1.getName(), cat.getCurrentProducts()[1].getName(),
+                  ProductCategory.BASE, ProductCategory.BASE,
+                  BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                  priceList1.getName(), priceList2.getName(),
+                  PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.ANNUAL, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.ANNUAL,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionException(cr,
+                           product1.getName(), product2.getName(),
+                           ProductCategory.BASE, ProductCategory.BASE,
+                           BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                           cat.getCurrentProducts()[1].getName(), priceList2.getName(),
+                           PhaseType.EVERGREEN, cat);
+
+        assertionException(cr,
+                           product1.getName(), product2.getName(),
+                           ProductCategory.BASE, ProductCategory.BASE,
+                           BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                           priceList1.getName(), cat.getCurrentProducts()[1].getName(),
+                           PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.TRIAL, cat);
+    }
+
+    @Test(enabled = true)
+    public void testWildcardFromProductCategory() throws CatalogApiException {
+        final MockCatalog cat = new MockCatalog();
+
+        final DefaultProduct product1 = cat.getCurrentProducts()[0];
+        final DefaultPriceList priceList1 = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
+
+        final DefaultProduct product2 = cat.getCurrentProducts()[2];
+        final DefaultPriceList priceList2 = cat.getPriceLists().getChildPriceLists()[1];
+
+
+        final CaseChangeResult cr = new CaseChangeResult(
+                product1, product2,
+                null, ProductCategory.BASE,
+                BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                priceList1, priceList2,
+                PhaseType.EVERGREEN,
+                Result.FOO);
+
+        assertion(Result.FOO, cr,
+                  product1.getName(), product2.getName(),
+                  ProductCategory.BASE, ProductCategory.BASE,
+                  BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                  priceList1.getName(), priceList2.getName(),
+                  PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      cat.getCurrentProducts()[1].getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), cat.getCurrentProducts()[1].getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertion(Result.FOO, cr,
+                  product1.getName(), product2.getName(),
+                  ProductCategory.ADD_ON, ProductCategory.BASE,
+                  BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                  priceList1.getName(), priceList2.getName(),
+                  PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.ADD_ON,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.ANNUAL, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.ANNUAL,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionException(cr,
+                           product1.getName(), product2.getName(),
+                           ProductCategory.BASE, ProductCategory.BASE,
+                           BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                           cat.getCurrentProducts()[1].getName(), priceList2.getName(),
+                           PhaseType.EVERGREEN, cat);
+
+        assertionException(cr,
+                           product1.getName(), product2.getName(),
+                           ProductCategory.BASE, ProductCategory.BASE,
+                           BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                           priceList1.getName(), cat.getCurrentProducts()[1].getName(),
+                           PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.TRIAL, cat);
+    }
+
+    @Test(enabled = true)
+    public void testWildcardToProductCategory() throws CatalogApiException {
+        final MockCatalog cat = new MockCatalog();
+
+        final DefaultProduct product1 = cat.getCurrentProducts()[0];
+        final DefaultPriceList priceList1 = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
+
+        final DefaultProduct product2 = cat.getCurrentProducts()[2];
+        final DefaultPriceList priceList2 = cat.getPriceLists().getChildPriceLists()[1];
+
+
+        final CaseChangeResult cr = new CaseChangeResult(
+                product1, product2,
+                ProductCategory.BASE, null,
+                BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                priceList1, priceList2,
+                PhaseType.EVERGREEN,
+                Result.FOO);
+
+        assertion(Result.FOO, cr,
+                  product1.getName(), product2.getName(),
+                  ProductCategory.BASE, ProductCategory.BASE,
+                  BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                  priceList1.getName(), priceList2.getName(),
+                  PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      cat.getCurrentProducts()[1].getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), cat.getCurrentProducts()[1].getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.ADD_ON, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertion(Result.FOO, cr,
+                  product1.getName(), product2.getName(),
+                  ProductCategory.BASE, ProductCategory.ADD_ON,
+                  BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                  priceList1.getName(), priceList2.getName(),
+                  PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.ANNUAL, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.ANNUAL,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionException(cr,
+                           product1.getName(), product2.getName(),
+                           ProductCategory.BASE, ProductCategory.BASE,
+                           BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                           cat.getCurrentProducts()[1].getName(), priceList2.getName(),
+                           PhaseType.EVERGREEN, cat);
+
+        assertionException(cr,
+                           product1.getName(), product2.getName(),
+                           ProductCategory.BASE, ProductCategory.BASE,
+                           BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                           priceList1.getName(), cat.getCurrentProducts()[1].getName(),
+                           PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.TRIAL, cat);
+    }
+
+    @Test(enabled = true)
+    public void testWildcardFromBillingPeriod() throws CatalogApiException {
+        final MockCatalog cat = new MockCatalog();
+
+        final DefaultProduct product1 = cat.getCurrentProducts()[0];
+        final DefaultPriceList priceList1 = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
+
+        final DefaultProduct product2 = cat.getCurrentProducts()[2];
+        final DefaultPriceList priceList2 = cat.getPriceLists().getChildPriceLists()[1];
+
+
+        final CaseChangeResult cr = new CaseChangeResult(
+                product1, product2,
+                ProductCategory.BASE, ProductCategory.BASE,
+                null, BillingPeriod.MONTHLY,
+                priceList1, priceList2,
+                PhaseType.EVERGREEN,
+                Result.FOO);
+
+        assertion(Result.FOO, cr,
+                  product1.getName(), product2.getName(),
+                  ProductCategory.BASE, ProductCategory.BASE,
+                  BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                  priceList1.getName(), priceList2.getName(),
+                  PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      cat.getCurrentProducts()[1].getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.ADD_ON, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.ADD_ON,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), cat.getCurrentProducts()[1].getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertion(Result.FOO, cr,
+                  product1.getName(), product2.getName(),
+                  ProductCategory.BASE, ProductCategory.BASE,
+                  BillingPeriod.ANNUAL, BillingPeriod.MONTHLY,
+                  priceList1.getName(), priceList2.getName(),
+                  PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.ANNUAL,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionException(cr,
+                           product1.getName(), product2.getName(),
+                           ProductCategory.BASE, ProductCategory.BASE,
+                           BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                           cat.getCurrentProducts()[1].getName(), priceList2.getName(),
+                           PhaseType.EVERGREEN, cat);
+
+        assertionException(cr,
+                           product1.getName(), product2.getName(),
+                           ProductCategory.BASE, ProductCategory.BASE,
+                           BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                           priceList1.getName(), cat.getCurrentProducts()[1].getName(),
+                           PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.TRIAL, cat);
+    }
+
+
+    @Test(enabled = true)
+    public void testWildCardToBillingPeriod() throws CatalogApiException {
+        final MockCatalog cat = new MockCatalog();
+
+        final DefaultProduct product1 = cat.getCurrentProducts()[0];
+        final DefaultPriceList priceList1 = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
+
+        final DefaultProduct product2 = cat.getCurrentProducts()[2];
+        final DefaultPriceList priceList2 = cat.getPriceLists().getChildPriceLists()[1];
+
+
+        final CaseChangeResult cr = new CaseChangeResult(
+                product1, product2,
+                ProductCategory.BASE, ProductCategory.BASE,
+                BillingPeriod.MONTHLY, null,
+                priceList1, priceList2,
+                PhaseType.EVERGREEN,
+                Result.FOO);
+
+        assertion(Result.FOO, cr,
+                  product1.getName(), product2.getName(),
+                  ProductCategory.BASE, ProductCategory.BASE,
+                  BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                  priceList1.getName(), priceList2.getName(),
+                  PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      cat.getCurrentProducts()[1].getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.ADD_ON, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.ADD_ON,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), cat.getCurrentProducts()[1].getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.ANNUAL, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertion(Result.FOO, cr,
+                  product1.getName(), product2.getName(),
+                  ProductCategory.BASE, ProductCategory.BASE,
+                  BillingPeriod.MONTHLY, BillingPeriod.ANNUAL,
+                  priceList1.getName(), priceList2.getName(),
+                  PhaseType.EVERGREEN, cat);
+
+        assertionException(cr,
+                           product1.getName(), product2.getName(),
+                           ProductCategory.BASE, ProductCategory.BASE,
+                           BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                           cat.getCurrentProducts()[1].getName(), priceList2.getName(),
+                           PhaseType.EVERGREEN, cat);
+
+        assertionException(cr,
+                           product1.getName(), product2.getName(),
+                           ProductCategory.BASE, ProductCategory.BASE,
+                           BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                           priceList1.getName(), cat.getCurrentProducts()[1].getName(),
+                           PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.TRIAL, cat);
+    }
+
+    @Test(enabled = true)
+    public void testWildCardFromPriceList() throws CatalogApiException {
+        final MockCatalog cat = new MockCatalog();
+
+        final DefaultProduct product1 = cat.getCurrentProducts()[0];
+        final DefaultPriceList priceList1 = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
+
+        final DefaultProduct product2 = cat.getCurrentProducts()[2];
+        final DefaultPriceList priceList2 = cat.getPriceLists().getChildPriceLists()[1];
+
+
+        final CaseChangeResult cr = new CaseChangeResult(
+                product1, product2,
+                ProductCategory.BASE, ProductCategory.BASE,
+                BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                null, priceList2,
+                PhaseType.EVERGREEN,
+                Result.FOO);
+
+        assertion(Result.FOO, cr,
+                  product1.getName(), product2.getName(),
+                  ProductCategory.BASE, ProductCategory.BASE,
+                  BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                  priceList1.getName(), priceList2.getName(),
+                  PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      cat.getCurrentProducts()[1].getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.ADD_ON, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.ADD_ON,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), cat.getCurrentProducts()[1].getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.ANNUAL, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.ANNUAL,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertion(Result.FOO, cr,
+                  product1.getName(), product2.getName(),
+                  ProductCategory.BASE, ProductCategory.BASE,
+                  BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                  cat.getCurrentProducts()[1].getName(), priceList2.getName(),
+                  PhaseType.EVERGREEN, cat);
+
+        assertionException(cr,
+                           product1.getName(), product2.getName(),
+                           ProductCategory.BASE, ProductCategory.BASE,
+                           BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                           priceList1.getName(), cat.getCurrentProducts()[1].getName(),
+                           PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.TRIAL, cat);
+    }
+
+    @Test(enabled = true)
+    public void testWildcardToPriceList() throws CatalogApiException {
+        final MockCatalog cat = new MockCatalog();
+
+        final DefaultProduct product1 = cat.getCurrentProducts()[0];
+        final DefaultPriceList priceList1 = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
+
+        final DefaultProduct product2 = cat.getCurrentProducts()[2];
+        final DefaultPriceList priceList2 = cat.getPriceLists().getChildPriceLists()[1];
+
+
+        final CaseChangeResult cr = new CaseChangeResult(
+                product1, product2,
+                ProductCategory.BASE, ProductCategory.BASE,
+                BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                priceList1, null,
+                PhaseType.EVERGREEN,
+                Result.FOO);
+
+        assertion(Result.FOO, cr,
+                  product1.getName(), product2.getName(),
+                  ProductCategory.BASE, ProductCategory.BASE,
+                  BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                  priceList1.getName(), priceList2.getName(),
+                  PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      cat.getCurrentProducts()[1].getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.ADD_ON, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.ADD_ON,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), cat.getCurrentProducts()[1].getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.ANNUAL, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.ANNUAL,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionException(cr,
+                           product1.getName(), product2.getName(),
+                           ProductCategory.BASE, ProductCategory.BASE,
+                           BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                           cat.getCurrentProducts()[1].getName(), priceList2.getName(),
+                           PhaseType.EVERGREEN, cat);
+
+        assertion(Result.FOO, cr,
+                  product1.getName(), product2.getName(),
+                  ProductCategory.BASE, ProductCategory.BASE,
+                  BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                  priceList1.getName(), cat.getCurrentProducts()[1].getName(),
+                  PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.TRIAL, cat);
+    }
+
+    @Test(enabled = true)
+    public void testWildcardPlanPhase() throws CatalogApiException {
+        final MockCatalog cat = new MockCatalog();
+
+        final DefaultProduct product1 = cat.getCurrentProducts()[0];
+        final DefaultPriceList priceList1 = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
+
+        final DefaultProduct product2 = cat.getCurrentProducts()[2];
+        final DefaultPriceList priceList2 = cat.getPriceLists().getChildPriceLists()[1];
+
+
+        final CaseChangeResult cr = new CaseChangeResult(
+                product1, product2,
+                ProductCategory.BASE, ProductCategory.BASE,
+                BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                priceList1, priceList2,
+                null,
+                Result.FOO);
+
+        assertion(Result.FOO, cr,
+                  product1.getName(), product2.getName(),
+                  ProductCategory.BASE, ProductCategory.BASE,
+                  BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                  priceList1.getName(), priceList2.getName(),
+                  PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      cat.getCurrentProducts()[1].getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.ADD_ON, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.ADD_ON,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), cat.getCurrentProducts()[1].getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.ANNUAL, BillingPeriod.MONTHLY,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionNull(cr,
+                      product1.getName(), product2.getName(),
+                      ProductCategory.BASE, ProductCategory.BASE,
+                      BillingPeriod.MONTHLY, BillingPeriod.ANNUAL,
+                      priceList1.getName(), priceList2.getName(),
+                      PhaseType.EVERGREEN, cat);
+
+        assertionException(cr,
+                           product1.getName(), product2.getName(),
+                           ProductCategory.BASE, ProductCategory.BASE,
+                           BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                           cat.getCurrentProducts()[1].getName(), priceList2.getName(),
+                           PhaseType.EVERGREEN, cat);
+
+        assertionException(cr,
+                           product1.getName(), product2.getName(),
+                           ProductCategory.BASE, ProductCategory.BASE,
+                           BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                           priceList1.getName(), cat.getCurrentProducts()[1].getName(),
+                           PhaseType.EVERGREEN, cat);
+
+        assertion(Result.FOO, cr,
+                  product1.getName(), product2.getName(),
+                  ProductCategory.BASE, ProductCategory.BASE,
+                  BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                  priceList1.getName(), priceList2.getName(),
+                  PhaseType.TRIAL, cat);
+    }
+
+
+    @Test(enabled = true)
+    public void testOrder() throws CatalogApiException {
+        final MockCatalog cat = new MockCatalog();
+
+        final DefaultProduct product1 = cat.getCurrentProducts()[0];
+        final DefaultPriceList priceList1 = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
+
+        final DefaultProduct product2 = cat.getCurrentProducts()[2];
+        final DefaultPriceList priceList2 = cat.getPriceLists().getChildPriceLists()[1];
+
+
+        final CaseChangeResult cr0 = new CaseChangeResult(
+                product1, product2,
+                ProductCategory.BASE, ProductCategory.BASE,
+                BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                priceList1, priceList2,
+                PhaseType.EVERGREEN,
+                Result.FOO);
+
+        final CaseChangeResult cr1 = new CaseChangeResult(
+                product1, product2,
+                ProductCategory.BASE, ProductCategory.BASE,
+                BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                priceList1, priceList2,
+                PhaseType.EVERGREEN,
+                Result.BAR);
+
+        final CaseChangeResult cr2 = new CaseChangeResult(
+                product1, product2,
+                ProductCategory.BASE, ProductCategory.BASE,
+                BillingPeriod.MONTHLY, BillingPeriod.MONTHLY,
+                priceList1, priceList2,
+                PhaseType.EVERGREEN,
+                Result.TINKYWINKY);
+
+        final CaseChangeResult cr3 = new CaseChangeResult(
+                product1, product2,
+                ProductCategory.BASE, ProductCategory.BASE,
+                BillingPeriod.MONTHLY, BillingPeriod.ANNUAL,
+                priceList1, priceList2,
+                PhaseType.EVERGREEN,
+                Result.DIPSY);
+
+        final CaseChangeResult cr4 = new CaseChangeResult(
+                product1, product2,
+                ProductCategory.BASE, ProductCategory.BASE,
+                BillingPeriod.MONTHLY, BillingPeriod.ANNUAL,
+                priceList1, priceList2,
+                PhaseType.EVERGREEN,
+                Result.LALA);
+
+        final Result r1 = CaseChange.getResult(new CaseChangeResult[]{cr0, cr1, cr2, cr3, cr4},
+                                         new PlanPhaseSpecifier(product1.getName(), product1.getCategory(), BillingPeriod.MONTHLY, priceList1.getName(), PhaseType.EVERGREEN),
+                                         new PlanSpecifier(product2.getName(), product2.getCategory(), BillingPeriod.MONTHLY, priceList2.getName()), cat);
+
+        assertEquals(Result.FOO, r1);
+
+        final Result r2 = CaseChange.getResult(new CaseChangeResult[]{cr0, cr1, cr2, cr3, cr4},
+                                         new PlanPhaseSpecifier(product1.getName(), product1.getCategory(), BillingPeriod.MONTHLY, priceList1.getName(), PhaseType.EVERGREEN),
+                                         new PlanSpecifier(product2.getName(), product2.getCategory(), BillingPeriod.ANNUAL, priceList2.getName()), cat);
+
+        assertEquals(Result.DIPSY, r2);
+
+    }
+
+
+    protected void assertionNull(final CaseChangeResult cr,
+                                 final String fromProductName, final String toProductName,
+                                 final ProductCategory fromProductCategory, final ProductCategory toProductCategory,
+                                 final BillingPeriod fromBp, final BillingPeriod toBp,
+                                 final String fromPriceListName, final String toPriceListName,
+                                 final PhaseType phaseType, final StandaloneCatalog cat) {
+        try {
+            assertNull(cr.getResult(new PlanPhaseSpecifier(fromProductName, fromProductCategory, fromBp, fromPriceListName, phaseType),
+                                    new PlanSpecifier(toProductName, toProductCategory, toBp, toPriceListName), cat));
+        } catch (CatalogApiException e) {
+            Assert.fail("", e);
+        }
+    }
+
+    protected void assertionException(final CaseChangeResult cr,
+                                      final String fromProductName, final String toProductName,
+                                      final ProductCategory fromProductCategory, final ProductCategory toProductCategory,
+                                      final BillingPeriod fromBp, final BillingPeriod toBp,
+                                      final String fromPriceListName, final String toPriceListName,
+                                      final PhaseType phaseType, final StandaloneCatalog cat) {
+        try {
+            cr.getResult(new PlanPhaseSpecifier(fromProductName, fromProductCategory, fromBp, fromPriceListName, phaseType),
+                         new PlanSpecifier(toProductName, toProductCategory, toBp, toPriceListName), cat);
+            Assert.fail("Expecting an exception");
+        } catch (CatalogApiException e) {
+            Assert.assertEquals(e.getCode(), ErrorCode.CAT_PRICE_LIST_NOT_FOUND.getCode());
+        }
+    }
+
+    protected void assertion(final Result result, final CaseChangeResult cr,
+                             final String fromProductName, final String toProductName,
+                             final ProductCategory fromProductCategory, final ProductCategory toProductCategory,
+                             final BillingPeriod fromBp, final BillingPeriod toBp,
+                             final String fromPriceListName, final String toPriceListName,
+                             final PhaseType phaseType, final StandaloneCatalog cat) {
+        try {
+            assertEquals(result, cr.getResult(new PlanPhaseSpecifier(fromProductName, fromProductCategory, fromBp, fromPriceListName, phaseType),
+                                              new PlanSpecifier(toProductName, toProductCategory, toBp, toPriceListName), cat));
+        } catch (CatalogApiException e) {
+            Assert.fail("", e);
+        }
+    }
 
 }

diff --git a/catalog/src/test/java/com/ning/billing/catalog/rules/TestCasePhase.java b/catalog/src/test/java/com/ning/billing/catalog/rules/TestCasePhase.java
index 1b28da7..26dfc5c 100644
--- a/catalog/src/test/java/com/ning/billing/catalog/rules/TestCasePhase.java
+++ b/catalog/src/test/java/com/ning/billing/catalog/rules/TestCasePhase.java
@@ -16,6 +16,11 @@
 
 package com.ning.billing.catalog.rules;
 
+import javax.xml.bind.annotation.XmlElement;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
 import com.ning.billing.ErrorCode;
 import com.ning.billing.catalog.DefaultPriceList;
 import com.ning.billing.catalog.DefaultProduct;
@@ -26,264 +31,260 @@ import com.ning.billing.catalog.api.CatalogApiException;
 import com.ning.billing.catalog.api.PhaseType;
 import com.ning.billing.catalog.api.PlanPhaseSpecifier;
 import com.ning.billing.catalog.api.ProductCategory;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import javax.xml.bind.annotation.XmlElement;
 
 public class TestCasePhase {
-	protected class CaseResult extends CasePhase<Result>  {
-
-		@XmlElement(required=true)
-		private Result policy;
-
-		public CaseResult(DefaultProduct product, ProductCategory productCategory, BillingPeriod billingPeriod, DefaultPriceList priceList,
-				PhaseType phaseType, Result policy) {
-			setProduct(product);
-			setProductCategory(productCategory);
-			setBillingPeriod(billingPeriod);
-			setPriceList(priceList);
-			setPhaseType(phaseType);
-			
-			this.policy = policy;
-		}
-
-		@Override
-		protected Result getResult() {
-			return policy;
-		}
-	}
-
-	@Test(enabled=true)
-	public void testBasic(){
-		MockCatalog cat = new MockCatalog();
-
-		DefaultProduct product = cat.getCurrentProducts()[0];
-		DefaultPriceList priceList = cat.getPriceLists().getDefaultPricelist();
-
-
-		CaseResult cr = new CaseResult(
-				product, 
-				ProductCategory.BASE,
-				BillingPeriod.MONTHLY, 
-				priceList,
-				PhaseType.EVERGREEN, 
-				Result.FOO);
-
-		assertion(Result.FOO, cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
-		assertionNull(cr,  cat.getCurrentProducts()[1].getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
-		assertionNull(cr, product.getName(), ProductCategory.ADD_ON,BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
-		assertionNull(cr, product.getName(), ProductCategory.BASE,BillingPeriod.ANNUAL, priceList.getName(), PhaseType.EVERGREEN, cat);
-		assertionException(cr, product.getName(), ProductCategory.BASE,BillingPeriod.MONTHLY, "dipsy", PhaseType.EVERGREEN, cat);
-		assertionNull(cr, product.getName(), ProductCategory.BASE,BillingPeriod.MONTHLY, priceList.getName(), PhaseType.TRIAL, cat);
-	}
-
-	@Test(enabled=true)
-	public void testWildCardProduct(){
-		MockCatalog cat = new MockCatalog();
-
-		DefaultProduct product = cat.getCurrentProducts()[0];
-		DefaultPriceList priceList = cat.getPriceLists().getDefaultPricelist();
-
-
-		CaseResult cr = new CaseResult(
-				null, 
-				ProductCategory.BASE,
-				BillingPeriod.MONTHLY, 
-				priceList,
-				PhaseType.EVERGREEN, 
-				Result.FOO);
-
-		assertion(Result.FOO, cr, product.getName(), ProductCategory.BASE,BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
-		assertion(Result.FOO, cr, cat.getCurrentProducts()[1].getName(), ProductCategory.BASE,BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
-		assertionNull(cr, product.getName(), ProductCategory.ADD_ON,BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
-		assertionNull(cr, product.getName(), ProductCategory.BASE,BillingPeriod.ANNUAL, priceList.getName(), PhaseType.EVERGREEN, cat);
-		assertionException(cr, product.getName(), ProductCategory.BASE,BillingPeriod.MONTHLY, "dipsy", PhaseType.EVERGREEN, cat);
-		assertionNull(cr, product.getName(), ProductCategory.BASE,BillingPeriod.MONTHLY, priceList.getName(), PhaseType.TRIAL, cat);
-	}
-	
-	@Test(enabled=true)
-	public void testWildCardProductCategory(){
-		MockCatalog cat = new MockCatalog();
-
-		DefaultProduct product = cat.getCurrentProducts()[0];
-		DefaultPriceList priceList = cat.getPriceLists().getDefaultPricelist();
-
-
-		CaseResult cr = new CaseResult(
-				product, 
-				null,
-				BillingPeriod.MONTHLY, 
-				priceList,
-				PhaseType.EVERGREEN, 
-				Result.FOO);
-
-		assertion(Result.FOO, cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
-		assertionNull(cr,  cat.getCurrentProducts()[1].getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
-		assertion(Result.FOO, cr, product.getName(), ProductCategory.ADD_ON,BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
-		assertionNull(cr, product.getName(), ProductCategory.BASE,BillingPeriod.ANNUAL, priceList.getName(), PhaseType.EVERGREEN, cat);
-		assertionException(cr, product.getName(), ProductCategory.BASE,BillingPeriod.MONTHLY, "dipsy", PhaseType.EVERGREEN, cat);
-		assertionNull(cr, product.getName(), ProductCategory.BASE,BillingPeriod.MONTHLY, priceList.getName(), PhaseType.TRIAL, cat);
-	}
-	
-	@Test(enabled=true)
-	public void testWildCardBillingPeriod(){
-		MockCatalog cat = new MockCatalog();
-
-		DefaultProduct product = cat.getCurrentProducts()[0];
-		DefaultPriceList priceList = cat.getPriceLists().getDefaultPricelist();
-
-
-		CaseResult cr = new CaseResult(
-				product, 
-				ProductCategory.BASE,
-				null, 
-				priceList,
-				PhaseType.EVERGREEN, 
-				Result.FOO);
-
-		assertion(Result.FOO, cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
-		assertionNull(cr,  cat.getCurrentProducts()[1].getName(), ProductCategory.BASE,BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
-		assertionNull(cr, product.getName(), ProductCategory.ADD_ON,BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
-		assertion(Result.FOO,cr, product.getName(), ProductCategory.BASE,BillingPeriod.ANNUAL, priceList.getName(), PhaseType.EVERGREEN, cat);
-		assertionException(cr, product.getName(), ProductCategory.BASE,BillingPeriod.MONTHLY, "dipsy", PhaseType.EVERGREEN, cat);
-		assertionNull(cr, product.getName(), ProductCategory.BASE,BillingPeriod.MONTHLY, priceList.getName(), PhaseType.TRIAL, cat);
-	}
-
-	@Test(enabled=true)
-	public void testWildCardPriceList(){
-		MockCatalog cat = new MockCatalog();
-
-		DefaultProduct product = cat.getCurrentProducts()[0];
-		DefaultPriceList priceList = cat.getPriceLists().getDefaultPricelist();
-
-
-		CaseResult cr = new CaseResult(
-				product, 
-				ProductCategory.BASE,
-				BillingPeriod.MONTHLY, 
-				null,
-				PhaseType.EVERGREEN, 
-				Result.FOO);
-
-		assertion(Result.FOO, cr, product.getName(), ProductCategory.BASE,BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
-		assertionNull(cr,  cat.getCurrentProducts()[1].getName(), ProductCategory.BASE,BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
-		assertionNull(cr, product.getName(), ProductCategory.ADD_ON,BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
-		assertionNull(cr, product.getName(), ProductCategory.BASE,BillingPeriod.ANNUAL, priceList.getName(), PhaseType.EVERGREEN, cat);
-		assertion(Result.FOO, cr, product.getName(), ProductCategory.BASE,BillingPeriod.MONTHLY, "dipsy", PhaseType.EVERGREEN, cat);
-		assertionNull(cr, product.getName(), ProductCategory.BASE,BillingPeriod.MONTHLY, priceList.getName(), PhaseType.TRIAL, cat);
-	}
-
-	@Test(enabled=true)
-	public void testWildCardPhaseType(){
-		MockCatalog cat = new MockCatalog();
-
-		DefaultProduct product = cat.getCurrentProducts()[0];
-		DefaultPriceList priceList = cat.getPriceLists().getDefaultPricelist();
-
-
-		CaseResult cr = new CaseResult(
-				product, 
-				ProductCategory.BASE,
-				BillingPeriod.MONTHLY, 
-				priceList,
-				null, 
-				Result.FOO);
-
-		assertion(Result.FOO, cr, product.getName(), ProductCategory.BASE,BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
-		assertionNull(cr,  cat.getCurrentProducts()[1].getName(), ProductCategory.BASE,BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
-		assertionNull(cr, product.getName(), ProductCategory.ADD_ON,BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
-		assertionNull(cr, product.getName(), ProductCategory.BASE,BillingPeriod.ANNUAL, priceList.getName(), PhaseType.EVERGREEN, cat);
-		assertionException(cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, "dipsy", PhaseType.EVERGREEN, cat);
-		assertion(Result.FOO,cr, product.getName(), ProductCategory.BASE,BillingPeriod.MONTHLY, priceList.getName(), PhaseType.TRIAL, cat);
-	}
-	
-	@Test(enabled=true)
-	public void testOrder() throws CatalogApiException {
-		MockCatalog cat = new MockCatalog();
-
-		DefaultProduct product = cat.getCurrentProducts()[0];
-		DefaultPriceList priceList = cat.getPriceLists().getDefaultPricelist();
-
-
-		CaseResult cr0 = new CaseResult(
-				product, 
-				ProductCategory.BASE,
-				BillingPeriod.MONTHLY, 
-				priceList,
-				PhaseType.EVERGREEN, 
-				Result.FOO);
-
-		CaseResult cr1 = new CaseResult(
-				product, 
-				ProductCategory.BASE,
-				BillingPeriod.MONTHLY, 
-				priceList,
-				PhaseType.EVERGREEN, 
-				Result.BAR);
-
-		CaseResult cr2 = new CaseResult(
-				product, 
-				ProductCategory.BASE,
-				BillingPeriod.MONTHLY, 
-				priceList,
-				PhaseType.EVERGREEN, 
-				Result.TINKYWINKY);
-
-		CaseResult cr3 = new CaseResult(
-				product, 
-				ProductCategory.BASE,
-				BillingPeriod.ANNUAL, 
-				priceList,
-				PhaseType.EVERGREEN, 
-				Result.DIPSY);
-
-		CaseResult cr4 = new CaseResult(
-				product, 
-				ProductCategory.BASE,
-				BillingPeriod.ANNUAL, 
-				priceList,
-				PhaseType.EVERGREEN, 
-				Result.LALA);
-		
-		Result r1 = CasePhase.getResult(new CaseResult[]{cr0, cr1, cr2,cr3,cr4}, 
-				new PlanPhaseSpecifier(product.getName(), product.getCategory(), BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN), cat);
-		
-		Assert.assertEquals(Result.FOO, r1);
-
-		Result r2 = CasePhase.getResult(new CaseResult[]{cr0, cr1, cr2,cr3,cr4}, 
-				new PlanPhaseSpecifier(product.getName(), product.getCategory(), BillingPeriod.ANNUAL, priceList.getName(), PhaseType.EVERGREEN), cat);
-		
-		Assert.assertEquals(Result.DIPSY, r2);
-
-	}
-
-
-	protected void assertionNull(CaseResult cr, String productName, ProductCategory productCategory, BillingPeriod bp, String priceListName, PhaseType phaseType, StandaloneCatalog cat){
-		try {
-			Assert.assertNull(cr.getResult(new PlanPhaseSpecifier(productName, productCategory, bp, priceListName, phaseType), cat));
-		} catch (CatalogApiException e) {
-			Assert.fail("", e);
-		}
-	}
-
-
-	protected void assertionException(CaseResult cr, String productName, ProductCategory productCategory, BillingPeriod bp, String priceListName, PhaseType phaseType, StandaloneCatalog cat){
-		try {
-			Assert.assertNull(cr.getResult(new PlanPhaseSpecifier(productName, productCategory, bp, priceListName, phaseType), cat));
-			Assert.fail("Exception expected");
-		} catch (CatalogApiException e) {
-			Assert.assertEquals(e.getCode(), ErrorCode.CAT_PRICE_LIST_NOT_FOUND.getCode());
-		}
-	}
-
-	protected void assertion(Result result, CaseResult cr, String productName, ProductCategory productCategory, BillingPeriod bp, String priceListName, PhaseType phaseType, StandaloneCatalog cat){
-		try {
-			Assert.assertEquals(result, cr.getResult(new PlanPhaseSpecifier(productName, productCategory, bp, priceListName, phaseType), cat));
-		} catch (CatalogApiException e) {
-			Assert.fail("", e);
-		}
-	}
+    protected class CaseResult extends CasePhase<Result> {
+
+        @XmlElement(required = true)
+        private final Result policy;
+
+        public CaseResult(final DefaultProduct product, final ProductCategory productCategory, final BillingPeriod billingPeriod, final DefaultPriceList priceList,
+                          final PhaseType phaseType, final Result policy) {
+            setProduct(product);
+            setProductCategory(productCategory);
+            setBillingPeriod(billingPeriod);
+            setPriceList(priceList);
+            setPhaseType(phaseType);
+
+            this.policy = policy;
+        }
+
+        @Override
+        protected Result getResult() {
+            return policy;
+        }
+    }
+
+    @Test(enabled = true)
+    public void testBasic() {
+        final MockCatalog cat = new MockCatalog();
+
+        final DefaultProduct product = cat.getCurrentProducts()[0];
+        final DefaultPriceList priceList = cat.getPriceLists().getDefaultPricelist();
+
+
+        final CaseResult cr = new CaseResult(
+                product,
+                ProductCategory.BASE,
+                BillingPeriod.MONTHLY,
+                priceList,
+                PhaseType.EVERGREEN,
+                Result.FOO);
+
+        assertion(Result.FOO, cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
+        assertionNull(cr, cat.getCurrentProducts()[1].getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
+        assertionNull(cr, product.getName(), ProductCategory.ADD_ON, BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
+        assertionNull(cr, product.getName(), ProductCategory.BASE, BillingPeriod.ANNUAL, priceList.getName(), PhaseType.EVERGREEN, cat);
+        assertionException(cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, "dipsy", PhaseType.EVERGREEN, cat);
+        assertionNull(cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), PhaseType.TRIAL, cat);
+    }
+
+    @Test(enabled = true)
+    public void testWildCardProduct() {
+        final MockCatalog cat = new MockCatalog();
+
+        final DefaultProduct product = cat.getCurrentProducts()[0];
+        final DefaultPriceList priceList = cat.getPriceLists().getDefaultPricelist();
+
+
+        final CaseResult cr = new CaseResult(
+                null,
+                ProductCategory.BASE,
+                BillingPeriod.MONTHLY,
+                priceList,
+                PhaseType.EVERGREEN,
+                Result.FOO);
+
+        assertion(Result.FOO, cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
+        assertion(Result.FOO, cr, cat.getCurrentProducts()[1].getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
+        assertionNull(cr, product.getName(), ProductCategory.ADD_ON, BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
+        assertionNull(cr, product.getName(), ProductCategory.BASE, BillingPeriod.ANNUAL, priceList.getName(), PhaseType.EVERGREEN, cat);
+        assertionException(cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, "dipsy", PhaseType.EVERGREEN, cat);
+        assertionNull(cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), PhaseType.TRIAL, cat);
+    }
+
+    @Test(enabled = true)
+    public void testWildCardProductCategory() {
+        final MockCatalog cat = new MockCatalog();
+
+        final DefaultProduct product = cat.getCurrentProducts()[0];
+        final DefaultPriceList priceList = cat.getPriceLists().getDefaultPricelist();
+
+
+        final CaseResult cr = new CaseResult(
+                product,
+                null,
+                BillingPeriod.MONTHLY,
+                priceList,
+                PhaseType.EVERGREEN,
+                Result.FOO);
+
+        assertion(Result.FOO, cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
+        assertionNull(cr, cat.getCurrentProducts()[1].getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
+        assertion(Result.FOO, cr, product.getName(), ProductCategory.ADD_ON, BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
+        assertionNull(cr, product.getName(), ProductCategory.BASE, BillingPeriod.ANNUAL, priceList.getName(), PhaseType.EVERGREEN, cat);
+        assertionException(cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, "dipsy", PhaseType.EVERGREEN, cat);
+        assertionNull(cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), PhaseType.TRIAL, cat);
+    }
+
+    @Test(enabled = true)
+    public void testWildCardBillingPeriod() {
+        final MockCatalog cat = new MockCatalog();
+
+        final DefaultProduct product = cat.getCurrentProducts()[0];
+        final DefaultPriceList priceList = cat.getPriceLists().getDefaultPricelist();
+
+
+        final CaseResult cr = new CaseResult(
+                product,
+                ProductCategory.BASE,
+                null,
+                priceList,
+                PhaseType.EVERGREEN,
+                Result.FOO);
+
+        assertion(Result.FOO, cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
+        assertionNull(cr, cat.getCurrentProducts()[1].getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
+        assertionNull(cr, product.getName(), ProductCategory.ADD_ON, BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
+        assertion(Result.FOO, cr, product.getName(), ProductCategory.BASE, BillingPeriod.ANNUAL, priceList.getName(), PhaseType.EVERGREEN, cat);
+        assertionException(cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, "dipsy", PhaseType.EVERGREEN, cat);
+        assertionNull(cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), PhaseType.TRIAL, cat);
+    }
+
+    @Test(enabled = true)
+    public void testWildCardPriceList() {
+        final MockCatalog cat = new MockCatalog();
+
+        final DefaultProduct product = cat.getCurrentProducts()[0];
+        final DefaultPriceList priceList = cat.getPriceLists().getDefaultPricelist();
+
+
+        final CaseResult cr = new CaseResult(
+                product,
+                ProductCategory.BASE,
+                BillingPeriod.MONTHLY,
+                null,
+                PhaseType.EVERGREEN,
+                Result.FOO);
+
+        assertion(Result.FOO, cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
+        assertionNull(cr, cat.getCurrentProducts()[1].getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
+        assertionNull(cr, product.getName(), ProductCategory.ADD_ON, BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
+        assertionNull(cr, product.getName(), ProductCategory.BASE, BillingPeriod.ANNUAL, priceList.getName(), PhaseType.EVERGREEN, cat);
+        assertion(Result.FOO, cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, "dipsy", PhaseType.EVERGREEN, cat);
+        assertionNull(cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), PhaseType.TRIAL, cat);
+    }
+
+    @Test(enabled = true)
+    public void testWildCardPhaseType() {
+        final MockCatalog cat = new MockCatalog();
+
+        final DefaultProduct product = cat.getCurrentProducts()[0];
+        final DefaultPriceList priceList = cat.getPriceLists().getDefaultPricelist();
+
+
+        final CaseResult cr = new CaseResult(
+                product,
+                ProductCategory.BASE,
+                BillingPeriod.MONTHLY,
+                priceList,
+                null,
+                Result.FOO);
+
+        assertion(Result.FOO, cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
+        assertionNull(cr, cat.getCurrentProducts()[1].getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
+        assertionNull(cr, product.getName(), ProductCategory.ADD_ON, BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN, cat);
+        assertionNull(cr, product.getName(), ProductCategory.BASE, BillingPeriod.ANNUAL, priceList.getName(), PhaseType.EVERGREEN, cat);
+        assertionException(cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, "dipsy", PhaseType.EVERGREEN, cat);
+        assertion(Result.FOO, cr, product.getName(), ProductCategory.BASE, BillingPeriod.MONTHLY, priceList.getName(), PhaseType.TRIAL, cat);
+    }
+
+    @Test(enabled = true)
+    public void testOrder() throws CatalogApiException {
+        final MockCatalog cat = new MockCatalog();
+
+        final DefaultProduct product = cat.getCurrentProducts()[0];
+        final DefaultPriceList priceList = cat.getPriceLists().getDefaultPricelist();
+
+
+        final CaseResult cr0 = new CaseResult(
+                product,
+                ProductCategory.BASE,
+                BillingPeriod.MONTHLY,
+                priceList,
+                PhaseType.EVERGREEN,
+                Result.FOO);
+
+        final CaseResult cr1 = new CaseResult(
+                product,
+                ProductCategory.BASE,
+                BillingPeriod.MONTHLY,
+                priceList,
+                PhaseType.EVERGREEN,
+                Result.BAR);
+
+        final CaseResult cr2 = new CaseResult(
+                product,
+                ProductCategory.BASE,
+                BillingPeriod.MONTHLY,
+                priceList,
+                PhaseType.EVERGREEN,
+                Result.TINKYWINKY);
+
+        final CaseResult cr3 = new CaseResult(
+                product,
+                ProductCategory.BASE,
+                BillingPeriod.ANNUAL,
+                priceList,
+                PhaseType.EVERGREEN,
+                Result.DIPSY);
+
+        final CaseResult cr4 = new CaseResult(
+                product,
+                ProductCategory.BASE,
+                BillingPeriod.ANNUAL,
+                priceList,
+                PhaseType.EVERGREEN,
+                Result.LALA);
+
+        final Result r1 = CasePhase.getResult(new CaseResult[]{cr0, cr1, cr2, cr3, cr4},
+                                        new PlanPhaseSpecifier(product.getName(), product.getCategory(), BillingPeriod.MONTHLY, priceList.getName(), PhaseType.EVERGREEN), cat);
+
+        Assert.assertEquals(Result.FOO, r1);
+
+        final Result r2 = CasePhase.getResult(new CaseResult[]{cr0, cr1, cr2, cr3, cr4},
+                                        new PlanPhaseSpecifier(product.getName(), product.getCategory(), BillingPeriod.ANNUAL, priceList.getName(), PhaseType.EVERGREEN), cat);
+
+        Assert.assertEquals(Result.DIPSY, r2);
+
+    }
+
+
+    protected void assertionNull(final CaseResult cr, final String productName, final ProductCategory productCategory, final BillingPeriod bp, final String priceListName, final PhaseType phaseType, final StandaloneCatalog cat) {
+        try {
+            Assert.assertNull(cr.getResult(new PlanPhaseSpecifier(productName, productCategory, bp, priceListName, phaseType), cat));
+        } catch (CatalogApiException e) {
+            Assert.fail("", e);
+        }
+    }
+
+
+    protected void assertionException(final CaseResult cr, final String productName, final ProductCategory productCategory, final BillingPeriod bp, final String priceListName, final PhaseType phaseType, final StandaloneCatalog cat) {
+        try {
+            Assert.assertNull(cr.getResult(new PlanPhaseSpecifier(productName, productCategory, bp, priceListName, phaseType), cat));
+            Assert.fail("Exception expected");
+        } catch (CatalogApiException e) {
+            Assert.assertEquals(e.getCode(), ErrorCode.CAT_PRICE_LIST_NOT_FOUND.getCode());
+        }
+    }
+
+    protected void assertion(final Result result, final CaseResult cr, final String productName, final ProductCategory productCategory, final BillingPeriod bp, final String priceListName, final PhaseType phaseType, final StandaloneCatalog cat) {
+        try {
+            Assert.assertEquals(result, cr.getResult(new PlanPhaseSpecifier(productName, productCategory, bp, priceListName, phaseType), cat));
+        } catch (CatalogApiException e) {
+            Assert.fail("", e);
+        }
+    }
 
 
 }

diff --git a/catalog/src/test/java/com/ning/billing/catalog/rules/TestLoadRules.java b/catalog/src/test/java/com/ning/billing/catalog/rules/TestLoadRules.java
index 6f1d9e2..0e8b04e 100644
--- a/catalog/src/test/java/com/ning/billing/catalog/rules/TestLoadRules.java
+++ b/catalog/src/test/java/com/ning/billing/catalog/rules/TestLoadRules.java
@@ -23,7 +23,6 @@ import org.testng.annotations.Test;
 
 import com.ning.billing.catalog.StandaloneCatalog;
 import com.ning.billing.catalog.api.BillingPeriod;
-import com.ning.billing.catalog.api.Plan;
 import com.ning.billing.catalog.api.PlanAlignmentCreate;
 import com.ning.billing.catalog.api.PlanSpecifier;
 import com.ning.billing.catalog.api.ProductCategory;
@@ -33,20 +32,20 @@ public class TestLoadRules {
 
     @Test
     public void test() throws Exception {
-        StandaloneCatalog catalog = XMLLoader.getObjectFromUri(new File("src/test/resources/WeaponsHireSmall.xml").toURI(), StandaloneCatalog.class);
+        final StandaloneCatalog catalog = XMLLoader.getObjectFromUri(new File("src/test/resources/WeaponsHireSmall.xml").toURI(), StandaloneCatalog.class);
         Assert.assertNotNull(catalog);
-        PlanRules rules = catalog.getPlanRules();
-        
-        PlanSpecifier specifier = new PlanSpecifier("Laser-Scope", ProductCategory.ADD_ON , BillingPeriod.MONTHLY,
-                "DEFAULT");
-        
-        PlanAlignmentCreate alignment=  rules.getPlanCreateAlignment(specifier, catalog);
+        final PlanRules rules = catalog.getPlanRules();
+
+        final PlanSpecifier specifier = new PlanSpecifier("Laser-Scope", ProductCategory.ADD_ON, BillingPeriod.MONTHLY,
+                                                    "DEFAULT");
+
+        final PlanAlignmentCreate alignment = rules.getPlanCreateAlignment(specifier, catalog);
         Assert.assertEquals(alignment, PlanAlignmentCreate.START_OF_SUBSCRIPTION);
-        
-        PlanSpecifier specifier2 = new PlanSpecifier("Extra-Ammo", ProductCategory.ADD_ON , BillingPeriod.MONTHLY,
-                "DEFAULT");
-        
-        PlanAlignmentCreate alignment2 = rules.getPlanCreateAlignment(specifier2, catalog);
+
+        final PlanSpecifier specifier2 = new PlanSpecifier("Extra-Ammo", ProductCategory.ADD_ON, BillingPeriod.MONTHLY,
+                                                     "DEFAULT");
+
+        final PlanAlignmentCreate alignment2 = rules.getPlanCreateAlignment(specifier2, catalog);
         Assert.assertEquals(alignment2, PlanAlignmentCreate.START_OF_BUNDLE);
     }
 }

diff --git a/catalog/src/test/java/com/ning/billing/catalog/rules/TestPlanRules.java b/catalog/src/test/java/com/ning/billing/catalog/rules/TestPlanRules.java
index e9617ea..bc876d3 100644
--- a/catalog/src/test/java/com/ning/billing/catalog/rules/TestPlanRules.java
+++ b/catalog/src/test/java/com/ning/billing/catalog/rules/TestPlanRules.java
@@ -16,10 +16,15 @@
 
 package com.ning.billing.catalog.rules;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.Assert;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
 import com.ning.billing.catalog.DefaultPriceList;
 import com.ning.billing.catalog.DefaultProduct;
 import com.ning.billing.catalog.MockCatalog;
-
 import com.ning.billing.catalog.api.ActionPolicy;
 import com.ning.billing.catalog.api.BillingPeriod;
 import com.ning.billing.catalog.api.CatalogApiException;
@@ -30,103 +35,97 @@ import com.ning.billing.catalog.api.PlanChangeResult;
 import com.ning.billing.catalog.api.PlanPhaseSpecifier;
 import com.ning.billing.catalog.api.PlanSpecifier;
 import com.ning.billing.catalog.api.PriceListSet;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.Assert;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
 
 public class TestPlanRules {
-	Logger log = LoggerFactory.getLogger(TestPlanRules.class);
-
-	private MockCatalog cat = null;
-
-	@BeforeTest
-	public void setup() {
-		cat = new MockCatalog();
-
-		DefaultPriceList priceList2 = cat.getPriceLists().getChildPriceLists()[0];
-
-		CaseChangePlanPolicy casePolicy = new CaseChangePlanPolicy().setPolicy(ActionPolicy.END_OF_TERM);
-		CaseChangePlanAlignment caseAlignment = new CaseChangePlanAlignment().setAlignment(PlanAlignmentChange.START_OF_SUBSCRIPTION);
-		CasePriceList casePriceList = new CasePriceList().setToPriceList(priceList2);
-
-		cat.getPlanRules().
-		setChangeCase(new CaseChangePlanPolicy[]{casePolicy}).
-		setChangeAlignmentCase(new CaseChangePlanAlignment[]{caseAlignment}).
-		setPriceListCase(new CasePriceList[]{casePriceList});
-	}
-
-	@Test
-	public void testCannotChangeToSamePlan() throws CatalogApiException {
-		DefaultProduct product1 = cat.getCurrentProducts()[0];
-		DefaultPriceList priceList1 = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
-		
-		PlanPhaseSpecifier from = new PlanPhaseSpecifier(product1.getName(), product1.getCategory(), BillingPeriod.MONTHLY, priceList1.getName(), PhaseType.EVERGREEN);
-		PlanSpecifier to = new PlanSpecifier(product1.getName(), product1.getCategory(), BillingPeriod.MONTHLY, priceList1.getName());
-
-		try {
-			cat.getPlanRules().planChange(from, to, cat);
-			Assert.fail("We did not see an exception when  trying to change plan to the same plan");
-		} catch (IllegalPlanChange e) {
-			log.info("Correct - cannot change to the same plan:", e);
-		} catch (CatalogApiException e) {
-			Assert.fail("", e);
-		}
-
-	}
-	
-	@Test
-	public void testExistingPriceListIsKept() throws CatalogApiException {
-		DefaultProduct product1 = cat.getCurrentProducts()[0];
-		DefaultPriceList priceList1 = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
-		
-		PlanPhaseSpecifier from = new PlanPhaseSpecifier(product1.getName(), product1.getCategory(), BillingPeriod.MONTHLY, priceList1.getName(), PhaseType.EVERGREEN);
-		PlanSpecifier to = new PlanSpecifier(product1.getName(), product1.getCategory(), BillingPeriod.ANNUAL, priceList1.getName());
-
-		PlanChangeResult result = null;
-		try {
-			result = cat.getPlanRules().planChange(from, to, cat);		
-		} catch (IllegalPlanChange e) {
-			log.info("Correct - cannot change to the same plan:", e);
-			Assert.fail("We should not have triggered this error");
-		} catch (CatalogApiException e) {
-			Assert.fail("", e);
-		}
-		
-		Assert.assertEquals(result.getPolicy(), ActionPolicy.END_OF_TERM);
-		Assert.assertEquals(result.getAlignment(), PlanAlignmentChange.START_OF_SUBSCRIPTION);
-		Assert.assertEquals(result.getNewPriceList(), priceList1);
-
-	}
-	
-	
-	@Test
-	public void testBaseCase() throws CatalogApiException {
-		DefaultProduct product1 = cat.getCurrentProducts()[0];
-		DefaultProduct product2 = cat.getCurrentProducts()[1];
-		DefaultPriceList priceList1 = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
-		DefaultPriceList priceList2 = cat.getPriceLists().getChildPriceLists()[0];
-		
-		PlanPhaseSpecifier from = new PlanPhaseSpecifier(product1.getName(), product1.getCategory(), BillingPeriod.MONTHLY, priceList1.getName(), PhaseType.EVERGREEN);
-		PlanSpecifier to = new PlanSpecifier(product2.getName(), product2.getCategory(), BillingPeriod.MONTHLY, null);
-
-		PlanChangeResult result = null;
-		try {
-			result = cat.getPlanRules().planChange(from, to, cat);	
-		} catch (IllegalPlanChange e) {
-			log.info("Correct - cannot change to the same plan:", e);
-			Assert.fail("We should not have triggered this error");
-		} catch (CatalogApiException e) {
-			Assert.fail("", e);
-		}
-		
-		Assert.assertEquals(result.getPolicy(), ActionPolicy.END_OF_TERM);
-		Assert.assertEquals(result.getAlignment(), PlanAlignmentChange.START_OF_SUBSCRIPTION);
-		Assert.assertEquals(result.getNewPriceList(), priceList2);
-
-	}
-	
-	
-	
+    Logger log = LoggerFactory.getLogger(TestPlanRules.class);
+
+    private MockCatalog cat = null;
+
+    @BeforeTest
+    public void setup() {
+        cat = new MockCatalog();
+
+        final DefaultPriceList priceList2 = cat.getPriceLists().getChildPriceLists()[0];
+
+        final CaseChangePlanPolicy casePolicy = new CaseChangePlanPolicy().setPolicy(ActionPolicy.END_OF_TERM);
+        final CaseChangePlanAlignment caseAlignment = new CaseChangePlanAlignment().setAlignment(PlanAlignmentChange.START_OF_SUBSCRIPTION);
+        final CasePriceList casePriceList = new CasePriceList().setToPriceList(priceList2);
+
+        cat.getPlanRules().
+                setChangeCase(new CaseChangePlanPolicy[]{casePolicy}).
+                setChangeAlignmentCase(new CaseChangePlanAlignment[]{caseAlignment}).
+                setPriceListCase(new CasePriceList[]{casePriceList});
+    }
+
+    @Test
+    public void testCannotChangeToSamePlan() throws CatalogApiException {
+        final DefaultProduct product1 = cat.getCurrentProducts()[0];
+        final DefaultPriceList priceList1 = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
+
+        final PlanPhaseSpecifier from = new PlanPhaseSpecifier(product1.getName(), product1.getCategory(), BillingPeriod.MONTHLY, priceList1.getName(), PhaseType.EVERGREEN);
+        final PlanSpecifier to = new PlanSpecifier(product1.getName(), product1.getCategory(), BillingPeriod.MONTHLY, priceList1.getName());
+
+        try {
+            cat.getPlanRules().planChange(from, to, cat);
+            Assert.fail("We did not see an exception when  trying to change plan to the same plan");
+        } catch (IllegalPlanChange e) {
+            log.info("Correct - cannot change to the same plan:", e);
+        } catch (CatalogApiException e) {
+            Assert.fail("", e);
+        }
+
+    }
+
+    @Test
+    public void testExistingPriceListIsKept() throws CatalogApiException {
+        final DefaultProduct product1 = cat.getCurrentProducts()[0];
+        final DefaultPriceList priceList1 = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
+
+        final PlanPhaseSpecifier from = new PlanPhaseSpecifier(product1.getName(), product1.getCategory(), BillingPeriod.MONTHLY, priceList1.getName(), PhaseType.EVERGREEN);
+        final PlanSpecifier to = new PlanSpecifier(product1.getName(), product1.getCategory(), BillingPeriod.ANNUAL, priceList1.getName());
+
+        PlanChangeResult result = null;
+        try {
+            result = cat.getPlanRules().planChange(from, to, cat);
+        } catch (IllegalPlanChange e) {
+            log.info("Correct - cannot change to the same plan:", e);
+            Assert.fail("We should not have triggered this error");
+        } catch (CatalogApiException e) {
+            Assert.fail("", e);
+        }
+
+        Assert.assertEquals(result.getPolicy(), ActionPolicy.END_OF_TERM);
+        Assert.assertEquals(result.getAlignment(), PlanAlignmentChange.START_OF_SUBSCRIPTION);
+        Assert.assertEquals(result.getNewPriceList(), priceList1);
+
+    }
+
+
+    @Test
+    public void testBaseCase() throws CatalogApiException {
+        final DefaultProduct product1 = cat.getCurrentProducts()[0];
+        final DefaultProduct product2 = cat.getCurrentProducts()[1];
+        final DefaultPriceList priceList1 = cat.findCurrentPriceList(PriceListSet.DEFAULT_PRICELIST_NAME);
+        final DefaultPriceList priceList2 = cat.getPriceLists().getChildPriceLists()[0];
+
+        final PlanPhaseSpecifier from = new PlanPhaseSpecifier(product1.getName(), product1.getCategory(), BillingPeriod.MONTHLY, priceList1.getName(), PhaseType.EVERGREEN);
+        final PlanSpecifier to = new PlanSpecifier(product2.getName(), product2.getCategory(), BillingPeriod.MONTHLY, null);
+
+        PlanChangeResult result = null;
+        try {
+            result = cat.getPlanRules().planChange(from, to, cat);
+        } catch (IllegalPlanChange e) {
+            log.info("Correct - cannot change to the same plan:", e);
+            Assert.fail("We should not have triggered this error");
+        } catch (CatalogApiException e) {
+            Assert.fail("", e);
+        }
+
+        Assert.assertEquals(result.getPolicy(), ActionPolicy.END_OF_TERM);
+        Assert.assertEquals(result.getAlignment(), PlanAlignmentChange.START_OF_SUBSCRIPTION);
+        Assert.assertEquals(result.getNewPriceList(), priceList2);
+
+    }
+
+
 }

diff --git a/catalog/src/test/java/com/ning/billing/catalog/TestCatalogService.java b/catalog/src/test/java/com/ning/billing/catalog/TestCatalogService.java
index 7bb45a6..38c21e2 100644
--- a/catalog/src/test/java/com/ning/billing/catalog/TestCatalogService.java
+++ b/catalog/src/test/java/com/ning/billing/catalog/TestCatalogService.java
@@ -16,40 +16,41 @@
 
 package com.ning.billing.catalog;
 
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
 import com.ning.billing.catalog.io.VersionedCatalogLoader;
 import com.ning.billing.config.CatalogConfig;
 import com.ning.billing.lifecycle.KillbillService.ServiceException;
 import com.ning.billing.util.clock.DefaultClock;
-import org.testng.Assert;
-import org.testng.annotations.Test;
 
 public class TestCatalogService {
 
-	@Test
-	public void testCatalogServiceDirectory() throws ServiceException {
-		DefaultCatalogService service = new DefaultCatalogService(new CatalogConfig() {
-			@Override
-			public String getCatalogURI() {
-				return "file:src/test/resources/versionedCatalog";
-			}
-			
-		}, new VersionedCatalogLoader(new DefaultClock()));
-		service.loadCatalog();
-		Assert.assertNotNull(service.getFullCatalog());
-		Assert.assertEquals(service.getFullCatalog().getCatalogName(), "WeaponsHireSmall");
-	}
-	
-	@Test
-	public void testCatalogServiceFile() throws ServiceException {
-		DefaultCatalogService service = new DefaultCatalogService(new CatalogConfig() {
-			@Override
-			public String getCatalogURI() {
-				return "file:src/test/resources/WeaponsHire.xml";
-			}
-			
-		}, new VersionedCatalogLoader(new DefaultClock()));
-		service.loadCatalog();
-		Assert.assertNotNull(service.getFullCatalog());
-		Assert.assertEquals(service.getFullCatalog().getCatalogName(), "Firearms");
-	}
+    @Test
+    public void testCatalogServiceDirectory() throws ServiceException {
+        final DefaultCatalogService service = new DefaultCatalogService(new CatalogConfig() {
+            @Override
+            public String getCatalogURI() {
+                return "file:src/test/resources/versionedCatalog";
+            }
+
+        }, new VersionedCatalogLoader(new DefaultClock()));
+        service.loadCatalog();
+        Assert.assertNotNull(service.getFullCatalog());
+        Assert.assertEquals(service.getFullCatalog().getCatalogName(), "WeaponsHireSmall");
+    }
+
+    @Test
+    public void testCatalogServiceFile() throws ServiceException {
+        final DefaultCatalogService service = new DefaultCatalogService(new CatalogConfig() {
+            @Override
+            public String getCatalogURI() {
+                return "file:src/test/resources/WeaponsHire.xml";
+            }
+
+        }, new VersionedCatalogLoader(new DefaultClock()));
+        service.loadCatalog();
+        Assert.assertNotNull(service.getFullCatalog());
+        Assert.assertEquals(service.getFullCatalog().getCatalogName(), "Firearms");
+    }
 }

diff --git a/catalog/src/test/java/com/ning/billing/catalog/TestInternationalPrice.java b/catalog/src/test/java/com/ning/billing/catalog/TestInternationalPrice.java
index 2772fc4..62fbe6c 100644
--- a/catalog/src/test/java/com/ning/billing/catalog/TestInternationalPrice.java
+++ b/catalog/src/test/java/com/ning/billing/catalog/TestInternationalPrice.java
@@ -15,82 +15,80 @@
  */
 package com.ning.billing.catalog;
 
-import com.ning.billing.catalog.api.CatalogApiException;
-import com.ning.billing.catalog.api.Currency;
-import com.ning.billing.util.config.ValidationErrors;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.net.URISyntaxException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import java.math.BigDecimal;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Date;
+import com.ning.billing.catalog.api.CatalogApiException;
+import com.ning.billing.catalog.api.Currency;
+import com.ning.billing.util.config.ValidationErrors;
 
 public class TestInternationalPrice {
-	private static final Logger log = LoggerFactory.getLogger(TestInternationalPrice.class);
-	
-  @Test
-  public void testZeroValue() throws URISyntaxException, CatalogApiException {
-	  StandaloneCatalog c = new MockCatalog();
-	  c.setSupportedCurrencies(new Currency[]{Currency.GBP, Currency.EUR, Currency.USD, Currency.BRL, Currency.MXN});
-	  DefaultInternationalPrice p0 =  new MockInternationalPrice();
-	  p0.setPrices(null);
-	  p0.initialize(c, new URI("foo:bar"));
-	  DefaultInternationalPrice p1 =  new MockInternationalPrice();
-	  p1.setPrices(new DefaultPrice[] {
-			  new DefaultPrice().setCurrency(Currency.GBP).setValue(new BigDecimal(1)),
-			  new DefaultPrice().setCurrency(Currency.EUR).setValue(new BigDecimal(1)),
-			  new DefaultPrice().setCurrency(Currency.USD).setValue(new BigDecimal(1)),
-			  new DefaultPrice().setCurrency(Currency.BRL).setValue(new BigDecimal(1)),
-			  new DefaultPrice().setCurrency(Currency.MXN).setValue(new BigDecimal(1)),		  
-	  });
-	  p1.initialize(c, new URI("foo:bar"));
+    private static final Logger log = LoggerFactory.getLogger(TestInternationalPrice.class);
+
+    @Test
+    public void testZeroValue() throws URISyntaxException, CatalogApiException {
+        final StandaloneCatalog c = new MockCatalog();
+        c.setSupportedCurrencies(new Currency[]{Currency.GBP, Currency.EUR, Currency.USD, Currency.BRL, Currency.MXN});
+        final DefaultInternationalPrice p0 = new MockInternationalPrice();
+        p0.setPrices(null);
+        p0.initialize(c, new URI("foo:bar"));
+        final DefaultInternationalPrice p1 = new MockInternationalPrice();
+        p1.setPrices(new DefaultPrice[]{
+                new DefaultPrice().setCurrency(Currency.GBP).setValue(new BigDecimal(1)),
+                new DefaultPrice().setCurrency(Currency.EUR).setValue(new BigDecimal(1)),
+                new DefaultPrice().setCurrency(Currency.USD).setValue(new BigDecimal(1)),
+                new DefaultPrice().setCurrency(Currency.BRL).setValue(new BigDecimal(1)),
+                new DefaultPrice().setCurrency(Currency.MXN).setValue(new BigDecimal(1)),
+        });
+        p1.initialize(c, new URI("foo:bar"));
+
+        Assert.assertEquals(p0.getPrice(Currency.GBP), new BigDecimal(0));
+        Assert.assertEquals(p0.getPrice(Currency.EUR), new BigDecimal(0));
+        Assert.assertEquals(p0.getPrice(Currency.USD), new BigDecimal(0));
+        Assert.assertEquals(p0.getPrice(Currency.BRL), new BigDecimal(0));
+        Assert.assertEquals(p0.getPrice(Currency.MXN), new BigDecimal(0));
+
+        Assert.assertEquals(p1.getPrice(Currency.GBP), new BigDecimal(1));
+        Assert.assertEquals(p1.getPrice(Currency.EUR), new BigDecimal(1));
+        Assert.assertEquals(p1.getPrice(Currency.USD), new BigDecimal(1));
+        Assert.assertEquals(p1.getPrice(Currency.BRL), new BigDecimal(1));
+        Assert.assertEquals(p1.getPrice(Currency.MXN), new BigDecimal(1));
+
+    }
+
+    @Test
+    public void testPriceInitialization() throws URISyntaxException, CatalogApiException {
+        final StandaloneCatalog c = new MockCatalog();
+        c.setSupportedCurrencies(new Currency[]{Currency.GBP, Currency.EUR, Currency.USD, Currency.BRL, Currency.MXN});
+        c.getCurrentPlans()[0].getFinalPhase().getRecurringPrice().setPrices(null);
+        c.initialize(c, new URI("foo://bar"));
+        Assert.assertEquals(c.getCurrentPlans()[0].getFinalPhase().getRecurringPrice().getPrice(Currency.GBP), new BigDecimal(0));
+    }
+
+    @Test
+    public void testNegativeValuePrices() {
+        final StandaloneCatalog c = new MockCatalog();
+        c.setSupportedCurrencies(new Currency[]{Currency.GBP, Currency.EUR, Currency.USD, Currency.BRL, Currency.MXN});
+
+        final DefaultInternationalPrice p1 = new MockInternationalPrice();
+        p1.setPrices(new DefaultPrice[]{
+                new DefaultPrice().setCurrency(Currency.GBP).setValue(new BigDecimal(-1)),
+                new DefaultPrice().setCurrency(Currency.EUR).setValue(new BigDecimal(-1)),
+                new DefaultPrice().setCurrency(Currency.USD).setValue(new BigDecimal(-1)),
+                new DefaultPrice().setCurrency(Currency.BRL).setValue(new BigDecimal(1)),
+                new DefaultPrice().setCurrency(Currency.MXN).setValue(new BigDecimal(1)),
+        });
+
+        final ValidationErrors errors = p1.validate(c, new ValidationErrors());
+        errors.log(log);
+        Assert.assertEquals(errors.size(), 3);
+    }
 
-	  Assert.assertEquals(p0.getPrice(Currency.GBP), new BigDecimal(0));
-	  Assert.assertEquals(p0.getPrice(Currency.EUR), new BigDecimal(0));
-	  Assert.assertEquals(p0.getPrice(Currency.USD), new BigDecimal(0));
-	  Assert.assertEquals(p0.getPrice(Currency.BRL), new BigDecimal(0));
-	  Assert.assertEquals(p0.getPrice(Currency.MXN), new BigDecimal(0));
-	  
-	  Assert.assertEquals(p1.getPrice(Currency.GBP), new BigDecimal(1));
-	  Assert.assertEquals(p1.getPrice(Currency.EUR), new BigDecimal(1));
-	  Assert.assertEquals(p1.getPrice(Currency.USD), new BigDecimal(1));
-	  Assert.assertEquals(p1.getPrice(Currency.BRL), new BigDecimal(1));
-	  Assert.assertEquals(p1.getPrice(Currency.MXN), new BigDecimal(1));
-	  
-  }
-  
-  @Test
-  public void testPriceInitialization() throws URISyntaxException, CatalogApiException  {
-	  StandaloneCatalog c = new MockCatalog();
-	  c.setSupportedCurrencies(new Currency[]{Currency.GBP, Currency.EUR, Currency.USD, Currency.BRL, Currency.MXN});
-	  c.getCurrentPlans()[0].getFinalPhase().getRecurringPrice().setPrices(null);
-	  c.initialize(c, new URI("foo://bar"));
-	  Assert.assertEquals(c.getCurrentPlans()[0].getFinalPhase().getRecurringPrice().getPrice(Currency.GBP), new BigDecimal(0));
-  }
-  
-   @Test
-  public void testNegativeValuePrices(){
-	  StandaloneCatalog c = new MockCatalog();
-	  c.setSupportedCurrencies(new Currency[]{Currency.GBP, Currency.EUR, Currency.USD, Currency.BRL, Currency.MXN});
-	
-	  DefaultInternationalPrice p1 =  new MockInternationalPrice();
-	  p1.setPrices(new DefaultPrice[] {
-			  new DefaultPrice().setCurrency(Currency.GBP).setValue(new BigDecimal(-1)),
-			  new DefaultPrice().setCurrency(Currency.EUR).setValue(new BigDecimal(-1)),
-			  new DefaultPrice().setCurrency(Currency.USD).setValue(new BigDecimal(-1)),
-			  new DefaultPrice().setCurrency(Currency.BRL).setValue(new BigDecimal(1)),
-			  new DefaultPrice().setCurrency(Currency.MXN).setValue(new BigDecimal(1)),		  
-	  });
-	  
-	 ValidationErrors errors = p1.validate(c, new ValidationErrors());
-	 errors.log(log);
-	 Assert.assertEquals(errors.size(), 3);
-  }
 
-  
-  
-  
 }

diff --git a/catalog/src/test/java/com/ning/billing/catalog/TestPlan.java b/catalog/src/test/java/com/ning/billing/catalog/TestPlan.java
index a8714c1..2aad0a6 100644
--- a/catalog/src/test/java/com/ning/billing/catalog/TestPlan.java
+++ b/catalog/src/test/java/com/ning/billing/catalog/TestPlan.java
@@ -25,38 +25,36 @@ import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import com.ning.billing.catalog.api.Currency;
-import com.ning.billing.catalog.api.Duration;
-import com.ning.billing.catalog.api.InternationalPrice;
-import com.ning.billing.catalog.api.PlanPhase;
 import com.ning.billing.util.config.ValidationErrors;
 
 public class TestPlan {
-	private static final Logger log = LoggerFactory.getLogger(TestPlan.class);
-	@Test(groups={"fast"}, enabled = true)
-	public void testDateValidation() {
-
-		StandaloneCatalog c = new MockCatalog();
-		c.setSupportedCurrencies(new Currency[]{Currency.GBP, Currency.EUR, Currency.USD, Currency.BRL, Currency.MXN});
-		DefaultPlan p1 =  MockPlan.createBicycleTrialEvergreen1USD();
-		p1.setEffectiveDateForExistingSubscriptons(new Date((new Date().getTime()) - (1000 * 60 * 60 * 24)));
-		ValidationErrors errors = p1.validate(c, new ValidationErrors());
-		Assert.assertEquals(errors.size(), 1);
-		errors.log(log);
-
-	}
-	
-	@Test(groups={"fast"}, enabled = true)
-	public void testDataCalc() {
-		DefaultPlan p0 = MockPlan.createBicycleTrialEvergreen1USD();  
-					
-		DefaultPlan p1 =  MockPlan.createBicycleTrialEvergreen1USD(100);
-		
-		DefaultPlan p2 =  MockPlan.createBicycleNoTrialEvergreen1USD(); 
-		
-		DateTime requestedDate = new DateTime();
-		Assert.assertEquals(p0.dateOfFirstRecurringNonZeroCharge(requestedDate).compareTo(requestedDate.plusDays(30)), 0);
-		Assert.assertEquals(p1.dateOfFirstRecurringNonZeroCharge(requestedDate).compareTo(requestedDate.plusDays(100)), 0);
-		Assert.assertEquals(p2.dateOfFirstRecurringNonZeroCharge(requestedDate).compareTo(requestedDate.plusDays(0)), 0);
-
-	}
+    private static final Logger log = LoggerFactory.getLogger(TestPlan.class);
+
+    @Test(groups = {"fast"}, enabled = true)
+    public void testDateValidation() {
+
+        final StandaloneCatalog c = new MockCatalog();
+        c.setSupportedCurrencies(new Currency[]{Currency.GBP, Currency.EUR, Currency.USD, Currency.BRL, Currency.MXN});
+        final DefaultPlan p1 = MockPlan.createBicycleTrialEvergreen1USD();
+        p1.setEffectiveDateForExistingSubscriptons(new Date((new Date().getTime()) - (1000 * 60 * 60 * 24)));
+        final ValidationErrors errors = p1.validate(c, new ValidationErrors());
+        Assert.assertEquals(errors.size(), 1);
+        errors.log(log);
+
+    }
+
+    @Test(groups = {"fast"}, enabled = true)
+    public void testDataCalc() {
+        final DefaultPlan p0 = MockPlan.createBicycleTrialEvergreen1USD();
+
+        final DefaultPlan p1 = MockPlan.createBicycleTrialEvergreen1USD(100);
+
+        final DefaultPlan p2 = MockPlan.createBicycleNoTrialEvergreen1USD();
+
+        final DateTime requestedDate = new DateTime();
+        Assert.assertEquals(p0.dateOfFirstRecurringNonZeroCharge(requestedDate).compareTo(requestedDate.plusDays(30)), 0);
+        Assert.assertEquals(p1.dateOfFirstRecurringNonZeroCharge(requestedDate).compareTo(requestedDate.plusDays(100)), 0);
+        Assert.assertEquals(p2.dateOfFirstRecurringNonZeroCharge(requestedDate).compareTo(requestedDate.plusDays(0)), 0);
+
+    }
 }

diff --git a/catalog/src/test/java/com/ning/billing/catalog/TestPlanPhase.java b/catalog/src/test/java/com/ning/billing/catalog/TestPlanPhase.java
index bee4e3d..ee3f11e 100644
--- a/catalog/src/test/java/com/ning/billing/catalog/TestPlanPhase.java
+++ b/catalog/src/test/java/com/ning/billing/catalog/TestPlanPhase.java
@@ -16,68 +16,67 @@
 
 package com.ning.billing.catalog;
 
-import com.ning.billing.catalog.api.BillingPeriod;
-import com.ning.billing.catalog.api.CatalogApiException;
-import com.ning.billing.catalog.api.PhaseType;
-import com.ning.billing.util.config.ValidationErrors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import com.ning.billing.catalog.api.BillingPeriod;
+import com.ning.billing.catalog.api.CatalogApiException;
+import com.ning.billing.catalog.api.PhaseType;
+import com.ning.billing.util.config.ValidationErrors;
+
 public class TestPlanPhase {
-	Logger log = LoggerFactory.getLogger(TestPlanPhase.class);
-	
-	@Test(enabled=true)
-	public void testValidation() {
-		log.info("Testing Plan Phase Validation");
-		
-		DefaultPlanPhase pp = MockPlanPhase.createUSDMonthlyEvergreen(null, "1.00").setPlan(MockPlan.createBicycleNoTrialEvergreen1USD());//new MockPlanPhase().setBillCycleDuration(BillingPeriod.MONTHLY).setRecurringPrice(null).setFixedPrice(new DefaultInternationalPrice());
-		
-		ValidationErrors errors = pp.validate(new MockCatalog(), new ValidationErrors());
-		errors.log(log);
-		Assert.assertEquals(errors.size(), 1);
-
-		pp = MockPlanPhase.createUSDMonthlyEvergreen("1.00", null).setBillCycleDuration(BillingPeriod.NO_BILLING_PERIOD).setPlan(MockPlan.createBicycleNoTrialEvergreen1USD());// new MockPlanPhase().setBillCycleDuration(BillingPeriod.NO_BILLING_PERIOD).setRecurringPrice(new MockInternationalPrice());
-		errors = pp.validate(new MockCatalog(), new ValidationErrors());
-		errors.log(log);
-		Assert.assertEquals(errors.size(), 1);
-
-		pp = MockPlanPhase.createUSDMonthlyEvergreen(null, null).setBillCycleDuration(BillingPeriod.NO_BILLING_PERIOD).setPlan(MockPlan.createBicycleNoTrialEvergreen1USD());//new MockPlanPhase().setRecurringPrice(null).setFixedPrice(null).setBillCycleDuration(BillingPeriod.NO_BILLING_PERIOD);
-		errors = pp.validate(new MockCatalog(), new ValidationErrors());
-		errors.log(log);
-		Assert.assertEquals(errors.size(), 1);
-	}
-	
-	@Test
-	public void testPhaseNames() throws CatalogApiException {
-		String planName = "Foo";
-		String planNameExt = planName + "-";
-		
-		DefaultPlan p = MockPlan.createBicycleNoTrialEvergreen1USD().setName(planName);
-		DefaultPlanPhase ppDiscount = MockPlanPhase.create1USDMonthlyEvergreen().setPhaseType(PhaseType.DISCOUNT).setPlan(p);
-		DefaultPlanPhase ppTrial = MockPlanPhase.create30DayTrial().setPhaseType(PhaseType.TRIAL).setPlan(p);
-		DefaultPlanPhase ppEvergreen = MockPlanPhase.create1USDMonthlyEvergreen().setPhaseType(PhaseType.EVERGREEN).setPlan(p);
-		DefaultPlanPhase ppFixedTerm = MockPlanPhase.create1USDMonthlyEvergreen().setPhaseType(PhaseType.FIXEDTERM).setPlan(p);
-		
-		String ppnDiscount = DefaultPlanPhase.phaseName(p.getName(), ppDiscount.getPhaseType());
-		String ppnTrial = DefaultPlanPhase.phaseName(p.getName(), ppTrial.getPhaseType());
-		String ppnEvergreen = DefaultPlanPhase.phaseName(p.getName(), ppEvergreen.getPhaseType());
-		String ppnFixedTerm = DefaultPlanPhase.phaseName(p.getName(), ppFixedTerm.getPhaseType());
-		
-		Assert.assertEquals(ppnTrial, planNameExt + "trial");
-		Assert.assertEquals(ppnEvergreen, planNameExt + "evergreen");
-		Assert.assertEquals(ppnFixedTerm, planNameExt + "fixedterm");
-		Assert.assertEquals(ppnDiscount, planNameExt + "discount");
-		
-		
-		Assert.assertEquals(DefaultPlanPhase.planName(ppnDiscount),planName);
-		Assert.assertEquals(DefaultPlanPhase.planName(ppnTrial),planName);
-		Assert.assertEquals(DefaultPlanPhase.planName(ppnEvergreen), planName);
-		Assert.assertEquals(DefaultPlanPhase.planName(ppnFixedTerm), planName);
-		
-		
-		
-		
-	}
+    Logger log = LoggerFactory.getLogger(TestPlanPhase.class);
+
+    @Test(enabled = true)
+    public void testValidation() {
+        log.info("Testing Plan Phase Validation");
+
+        DefaultPlanPhase pp = MockPlanPhase.createUSDMonthlyEvergreen(null, "1.00").setPlan(MockPlan.createBicycleNoTrialEvergreen1USD());//new MockPlanPhase().setBillCycleDuration(BillingPeriod.MONTHLY).setRecurringPrice(null).setFixedPrice(new DefaultInternationalPrice());
+
+        ValidationErrors errors = pp.validate(new MockCatalog(), new ValidationErrors());
+        errors.log(log);
+        Assert.assertEquals(errors.size(), 1);
+
+        pp = MockPlanPhase.createUSDMonthlyEvergreen("1.00", null).setBillCycleDuration(BillingPeriod.NO_BILLING_PERIOD).setPlan(MockPlan.createBicycleNoTrialEvergreen1USD());// new MockPlanPhase().setBillCycleDuration(BillingPeriod.NO_BILLING_PERIOD).setRecurringPrice(new MockInternationalPrice());
+        errors = pp.validate(new MockCatalog(), new ValidationErrors());
+        errors.log(log);
+        Assert.assertEquals(errors.size(), 1);
+
+        pp = MockPlanPhase.createUSDMonthlyEvergreen(null, null).setBillCycleDuration(BillingPeriod.NO_BILLING_PERIOD).setPlan(MockPlan.createBicycleNoTrialEvergreen1USD());//new MockPlanPhase().setRecurringPrice(null).setFixedPrice(null).setBillCycleDuration(BillingPeriod.NO_BILLING_PERIOD);
+        errors = pp.validate(new MockCatalog(), new ValidationErrors());
+        errors.log(log);
+        Assert.assertEquals(errors.size(), 1);
+    }
+
+    @Test
+    public void testPhaseNames() throws CatalogApiException {
+        final String planName = "Foo";
+        final String planNameExt = planName + "-";
+
+        final DefaultPlan p = MockPlan.createBicycleNoTrialEvergreen1USD().setName(planName);
+        final DefaultPlanPhase ppDiscount = MockPlanPhase.create1USDMonthlyEvergreen().setPhaseType(PhaseType.DISCOUNT).setPlan(p);
+        final DefaultPlanPhase ppTrial = MockPlanPhase.create30DayTrial().setPhaseType(PhaseType.TRIAL).setPlan(p);
+        final DefaultPlanPhase ppEvergreen = MockPlanPhase.create1USDMonthlyEvergreen().setPhaseType(PhaseType.EVERGREEN).setPlan(p);
+        final DefaultPlanPhase ppFixedTerm = MockPlanPhase.create1USDMonthlyEvergreen().setPhaseType(PhaseType.FIXEDTERM).setPlan(p);
+
+        final String ppnDiscount = DefaultPlanPhase.phaseName(p.getName(), ppDiscount.getPhaseType());
+        final String ppnTrial = DefaultPlanPhase.phaseName(p.getName(), ppTrial.getPhaseType());
+        final String ppnEvergreen = DefaultPlanPhase.phaseName(p.getName(), ppEvergreen.getPhaseType());
+        final String ppnFixedTerm = DefaultPlanPhase.phaseName(p.getName(), ppFixedTerm.getPhaseType());
+
+        Assert.assertEquals(ppnTrial, planNameExt + "trial");
+        Assert.assertEquals(ppnEvergreen, planNameExt + "evergreen");
+        Assert.assertEquals(ppnFixedTerm, planNameExt + "fixedterm");
+        Assert.assertEquals(ppnDiscount, planNameExt + "discount");
+
+
+        Assert.assertEquals(DefaultPlanPhase.planName(ppnDiscount), planName);
+        Assert.assertEquals(DefaultPlanPhase.planName(ppnTrial), planName);
+        Assert.assertEquals(DefaultPlanPhase.planName(ppnEvergreen), planName);
+        Assert.assertEquals(DefaultPlanPhase.planName(ppnFixedTerm), planName);
+
+
+    }
 }

diff --git a/catalog/src/test/java/com/ning/billing/catalog/TestPriceListSet.java b/catalog/src/test/java/com/ning/billing/catalog/TestPriceListSet.java
index a26ce10..107283d 100644
--- a/catalog/src/test/java/com/ning/billing/catalog/TestPriceListSet.java
+++ b/catalog/src/test/java/com/ning/billing/catalog/TestPriceListSet.java
@@ -16,13 +16,14 @@
 
 package com.ning.billing.catalog;
 
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
 import com.ning.billing.catalog.api.BillingPeriod;
 import com.ning.billing.catalog.api.CatalogApiException;
 import com.ning.billing.catalog.api.PhaseType;
 import com.ning.billing.catalog.api.PriceListSet;
 import com.ning.billing.catalog.api.ProductCategory;
-import org.testng.Assert;
-import org.testng.annotations.Test;
 
 import static com.ning.billing.catalog.api.BillingPeriod.ANNUAL;
 import static com.ning.billing.catalog.api.BillingPeriod.MONTHLY;
@@ -30,56 +31,56 @@ import static com.ning.billing.catalog.api.PhaseType.DISCOUNT;
 import static com.ning.billing.catalog.api.PhaseType.EVERGREEN;
 
 public class TestPriceListSet {
-	@Test(enabled=true)
-	public void testOverriding() throws CatalogApiException {
-		DefaultProduct foo = new DefaultProduct("Foo", ProductCategory.BASE);
-		DefaultProduct bar = new DefaultProduct("Bar", ProductCategory.BASE);
-		DefaultPlan[] defaultPlans = new DefaultPlan[]{ 
-				new MockPlan().setName("plan-foo-monthly").setProduct(foo).setFinalPhase(new MockPlanPhase().setBillCycleDuration(MONTHLY).setPhaseType(EVERGREEN)),
-				new MockPlan().setName("plan-bar-monthly").setProduct(bar).setFinalPhase(new MockPlanPhase().setBillCycleDuration(MONTHLY).setPhaseType(EVERGREEN)),
-				new MockPlan().setName("plan-foo-annual").setProduct(foo).setFinalPhase(new MockPlanPhase().setBillCycleDuration(ANNUAL).setPhaseType(EVERGREEN)),
-				new MockPlan().setName("plan-bar-annual").setProduct(bar).setFinalPhase(new MockPlanPhase().setBillCycleDuration(ANNUAL).setPhaseType(EVERGREEN))
-				};
-		DefaultPlan[] childPlans = new DefaultPlan[]{ 
-				new MockPlan().setName("plan-foo").setProduct(foo).setFinalPhase(new MockPlanPhase().setBillCycleDuration(ANNUAL).setPhaseType(DISCOUNT)),
-				new MockPlan().setName("plan-bar").setProduct(bar).setFinalPhase(new MockPlanPhase().setBillCycleDuration(ANNUAL).setPhaseType(DISCOUNT))
-				};
-		PriceListDefault defaultPriceList = new PriceListDefault(defaultPlans);
-		DefaultPriceList[] childPriceLists = new DefaultPriceList[] {
-				new DefaultPriceList(childPlans, "child")
-		};
-		DefaultPriceListSet set = new DefaultPriceListSet(defaultPriceList, childPriceLists);
-		
-		Assert.assertEquals(set.getPlanFrom(PriceListSet.DEFAULT_PRICELIST_NAME, foo, BillingPeriod.ANNUAL).getFinalPhase().getPhaseType(), PhaseType.EVERGREEN);
-		Assert.assertEquals(set.getPlanFrom(PriceListSet.DEFAULT_PRICELIST_NAME, foo, BillingPeriod.MONTHLY).getFinalPhase().getPhaseType(), PhaseType.EVERGREEN);
-		Assert.assertEquals(set.getPlanFrom("child", foo, BillingPeriod.ANNUAL).getFinalPhase().getPhaseType(), PhaseType.DISCOUNT);
-		Assert.assertEquals(set.getPlanFrom("child", foo, BillingPeriod.MONTHLY).getFinalPhase().getPhaseType(), PhaseType.EVERGREEN);
-	}
-	
-	public void testForNullBillingPeriod() throws CatalogApiException {
-		DefaultProduct foo = new DefaultProduct("Foo", ProductCategory.BASE);
-		DefaultProduct bar = new DefaultProduct("Bar", ProductCategory.BASE);
-		DefaultPlan[] defaultPlans = new DefaultPlan[]{ 
-				new MockPlan().setName("plan-foo-monthly").setProduct(foo).setFinalPhase(new MockPlanPhase().setBillCycleDuration(MONTHLY).setPhaseType(EVERGREEN)),
-				new MockPlan().setName("plan-bar-monthly").setProduct(bar).setFinalPhase(new MockPlanPhase().setBillCycleDuration(MONTHLY).setPhaseType(EVERGREEN)),
-				new MockPlan().setName("plan-foo-annual").setProduct(foo).setFinalPhase(new MockPlanPhase().setBillCycleDuration(null).setPhaseType(EVERGREEN)),
-				new MockPlan().setName("plan-bar-annual").setProduct(bar).setFinalPhase(new MockPlanPhase().setBillCycleDuration(null).setPhaseType(EVERGREEN))
-				};
-		DefaultPlan[] childPlans = new DefaultPlan[]{ 
-				new MockPlan().setName("plan-foo").setProduct(foo).setFinalPhase(new MockPlanPhase().setBillCycleDuration(ANNUAL).setPhaseType(DISCOUNT)),
-				new MockPlan().setName("plan-bar").setProduct(bar).setFinalPhase(new MockPlanPhase().setBillCycleDuration(ANNUAL).setPhaseType(DISCOUNT))
-				};
+    @Test(enabled = true)
+    public void testOverriding() throws CatalogApiException {
+        final DefaultProduct foo = new DefaultProduct("Foo", ProductCategory.BASE);
+        final DefaultProduct bar = new DefaultProduct("Bar", ProductCategory.BASE);
+        final DefaultPlan[] defaultPlans = new DefaultPlan[]{
+                new MockPlan().setName("plan-foo-monthly").setProduct(foo).setFinalPhase(new MockPlanPhase().setBillCycleDuration(MONTHLY).setPhaseType(EVERGREEN)),
+                new MockPlan().setName("plan-bar-monthly").setProduct(bar).setFinalPhase(new MockPlanPhase().setBillCycleDuration(MONTHLY).setPhaseType(EVERGREEN)),
+                new MockPlan().setName("plan-foo-annual").setProduct(foo).setFinalPhase(new MockPlanPhase().setBillCycleDuration(ANNUAL).setPhaseType(EVERGREEN)),
+                new MockPlan().setName("plan-bar-annual").setProduct(bar).setFinalPhase(new MockPlanPhase().setBillCycleDuration(ANNUAL).setPhaseType(EVERGREEN))
+        };
+        final DefaultPlan[] childPlans = new DefaultPlan[]{
+                new MockPlan().setName("plan-foo").setProduct(foo).setFinalPhase(new MockPlanPhase().setBillCycleDuration(ANNUAL).setPhaseType(DISCOUNT)),
+                new MockPlan().setName("plan-bar").setProduct(bar).setFinalPhase(new MockPlanPhase().setBillCycleDuration(ANNUAL).setPhaseType(DISCOUNT))
+        };
+        final PriceListDefault defaultPriceList = new PriceListDefault(defaultPlans);
+        final DefaultPriceList[] childPriceLists = new DefaultPriceList[]{
+                new DefaultPriceList(childPlans, "child")
+        };
+        final DefaultPriceListSet set = new DefaultPriceListSet(defaultPriceList, childPriceLists);
+
+        Assert.assertEquals(set.getPlanFrom(PriceListSet.DEFAULT_PRICELIST_NAME, foo, BillingPeriod.ANNUAL).getFinalPhase().getPhaseType(), PhaseType.EVERGREEN);
+        Assert.assertEquals(set.getPlanFrom(PriceListSet.DEFAULT_PRICELIST_NAME, foo, BillingPeriod.MONTHLY).getFinalPhase().getPhaseType(), PhaseType.EVERGREEN);
+        Assert.assertEquals(set.getPlanFrom("child", foo, BillingPeriod.ANNUAL).getFinalPhase().getPhaseType(), PhaseType.DISCOUNT);
+        Assert.assertEquals(set.getPlanFrom("child", foo, BillingPeriod.MONTHLY).getFinalPhase().getPhaseType(), PhaseType.EVERGREEN);
+    }
+
+    public void testForNullBillingPeriod() throws CatalogApiException {
+        final DefaultProduct foo = new DefaultProduct("Foo", ProductCategory.BASE);
+        final DefaultProduct bar = new DefaultProduct("Bar", ProductCategory.BASE);
+        final DefaultPlan[] defaultPlans = new DefaultPlan[]{
+                new MockPlan().setName("plan-foo-monthly").setProduct(foo).setFinalPhase(new MockPlanPhase().setBillCycleDuration(MONTHLY).setPhaseType(EVERGREEN)),
+                new MockPlan().setName("plan-bar-monthly").setProduct(bar).setFinalPhase(new MockPlanPhase().setBillCycleDuration(MONTHLY).setPhaseType(EVERGREEN)),
+                new MockPlan().setName("plan-foo-annual").setProduct(foo).setFinalPhase(new MockPlanPhase().setBillCycleDuration(null).setPhaseType(EVERGREEN)),
+                new MockPlan().setName("plan-bar-annual").setProduct(bar).setFinalPhase(new MockPlanPhase().setBillCycleDuration(null).setPhaseType(EVERGREEN))
+        };
+        final DefaultPlan[] childPlans = new DefaultPlan[]{
+                new MockPlan().setName("plan-foo").setProduct(foo).setFinalPhase(new MockPlanPhase().setBillCycleDuration(ANNUAL).setPhaseType(DISCOUNT)),
+                new MockPlan().setName("plan-bar").setProduct(bar).setFinalPhase(new MockPlanPhase().setBillCycleDuration(ANNUAL).setPhaseType(DISCOUNT))
+        };
+
+        final PriceListDefault defaultPriceList = new PriceListDefault(defaultPlans);
+        final DefaultPriceList[] childPriceLists = new DefaultPriceList[]{
+                new DefaultPriceList(childPlans, "child")
+        };
+        final DefaultPriceListSet set = new DefaultPriceListSet(defaultPriceList, childPriceLists);
 
-		PriceListDefault defaultPriceList = new PriceListDefault(defaultPlans);
-		DefaultPriceList[] childPriceLists = new DefaultPriceList[] {
-				new DefaultPriceList(childPlans, "child")
-		};
-		DefaultPriceListSet set = new DefaultPriceListSet(defaultPriceList, childPriceLists);
-		
-		Assert.assertEquals(set.getPlanFrom("child", foo, BillingPeriod.ANNUAL).getFinalPhase().getPhaseType(), PhaseType.DISCOUNT);
-		Assert.assertEquals(set.getPlanFrom("child", foo, BillingPeriod.MONTHLY).getFinalPhase().getPhaseType(), PhaseType.EVERGREEN);
-		Assert.assertEquals(set.getPlanFrom(PriceListSet.DEFAULT_PRICELIST_NAME, foo, BillingPeriod.ANNUAL).getFinalPhase().getPhaseType(), PhaseType.EVERGREEN);
-		Assert.assertEquals(set.getPlanFrom(PriceListSet.DEFAULT_PRICELIST_NAME, foo, BillingPeriod.MONTHLY).getFinalPhase().getPhaseType(), PhaseType.EVERGREEN);
-	}
+        Assert.assertEquals(set.getPlanFrom("child", foo, BillingPeriod.ANNUAL).getFinalPhase().getPhaseType(), PhaseType.DISCOUNT);
+        Assert.assertEquals(set.getPlanFrom("child", foo, BillingPeriod.MONTHLY).getFinalPhase().getPhaseType(), PhaseType.EVERGREEN);
+        Assert.assertEquals(set.getPlanFrom(PriceListSet.DEFAULT_PRICELIST_NAME, foo, BillingPeriod.ANNUAL).getFinalPhase().getPhaseType(), PhaseType.EVERGREEN);
+        Assert.assertEquals(set.getPlanFrom(PriceListSet.DEFAULT_PRICELIST_NAME, foo, BillingPeriod.MONTHLY).getFinalPhase().getPhaseType(), PhaseType.EVERGREEN);
+    }
 
 }

diff --git a/catalog/src/test/java/com/ning/billing/catalog/TestStandaloneCatalog.java b/catalog/src/test/java/com/ning/billing/catalog/TestStandaloneCatalog.java
index fd5d8fb..edca7f1 100644
--- a/catalog/src/test/java/com/ning/billing/catalog/TestStandaloneCatalog.java
+++ b/catalog/src/test/java/com/ning/billing/catalog/TestStandaloneCatalog.java
@@ -23,30 +23,30 @@ import com.ning.billing.catalog.api.CatalogApiException;
 import com.ning.billing.catalog.api.PhaseType;
 
 public class TestStandaloneCatalog {
-	
-		@Test
-		public void testFindPhase() throws CatalogApiException{
-			DefaultPlanPhase phaseTrial1 = new MockPlanPhase().setPhaseType(PhaseType.TRIAL);
-			DefaultPlanPhase phaseTrial2 = new MockPlanPhase().setPhaseType(PhaseType.TRIAL);
-			DefaultPlanPhase phaseDiscount1 = new MockPlanPhase().setPhaseType(PhaseType.DISCOUNT);
-			DefaultPlanPhase phaseDiscount2 = new MockPlanPhase().setPhaseType(PhaseType.DISCOUNT);
-			
-			DefaultPlan plan1 = new MockPlan().setName("TestPlan1").setFinalPhase(phaseDiscount1).setInitialPhases(new DefaultPlanPhase[]{phaseTrial1});
-			DefaultPlan plan2 = new MockPlan().setName("TestPlan2").setFinalPhase(phaseDiscount2).setInitialPhases(new DefaultPlanPhase[]{phaseTrial2});
-			phaseTrial1.setPlan(plan1);
-			phaseTrial2.setPlan(plan2);
-			phaseDiscount1.setPlan(plan1);
-			phaseDiscount2.setPlan(plan2);
-			
-			StandaloneCatalog cat = new MockCatalog().setPlans(new DefaultPlan[]{plan1, plan2});
-			
-			Assert.assertEquals(cat.findCurrentPhase("TestPlan1-discount"), phaseDiscount1);
-			Assert.assertEquals(cat.findCurrentPhase("TestPlan2-discount"), phaseDiscount2);
-			Assert.assertEquals(cat.findCurrentPhase("TestPlan1-trial"), phaseTrial1);
-			Assert.assertEquals(cat.findCurrentPhase("TestPlan2-trial"), phaseTrial2);
-			
-			
-		}
-		
-		
+
+    @Test
+    public void testFindPhase() throws CatalogApiException {
+        final DefaultPlanPhase phaseTrial1 = new MockPlanPhase().setPhaseType(PhaseType.TRIAL);
+        final DefaultPlanPhase phaseTrial2 = new MockPlanPhase().setPhaseType(PhaseType.TRIAL);
+        final DefaultPlanPhase phaseDiscount1 = new MockPlanPhase().setPhaseType(PhaseType.DISCOUNT);
+        final DefaultPlanPhase phaseDiscount2 = new MockPlanPhase().setPhaseType(PhaseType.DISCOUNT);
+
+        final DefaultPlan plan1 = new MockPlan().setName("TestPlan1").setFinalPhase(phaseDiscount1).setInitialPhases(new DefaultPlanPhase[]{phaseTrial1});
+        final DefaultPlan plan2 = new MockPlan().setName("TestPlan2").setFinalPhase(phaseDiscount2).setInitialPhases(new DefaultPlanPhase[]{phaseTrial2});
+        phaseTrial1.setPlan(plan1);
+        phaseTrial2.setPlan(plan2);
+        phaseDiscount1.setPlan(plan1);
+        phaseDiscount2.setPlan(plan2);
+
+        final StandaloneCatalog cat = new MockCatalog().setPlans(new DefaultPlan[]{plan1, plan2});
+
+        Assert.assertEquals(cat.findCurrentPhase("TestPlan1-discount"), phaseDiscount1);
+        Assert.assertEquals(cat.findCurrentPhase("TestPlan2-discount"), phaseDiscount2);
+        Assert.assertEquals(cat.findCurrentPhase("TestPlan1-trial"), phaseTrial1);
+        Assert.assertEquals(cat.findCurrentPhase("TestPlan2-trial"), phaseTrial2);
+
+
+    }
+
+
 }

diff --git a/catalog/src/test/java/com/ning/billing/catalog/TestVersionedCatalog.java b/catalog/src/test/java/com/ning/billing/catalog/TestVersionedCatalog.java
index fb61be7..a972fd5 100644
--- a/catalog/src/test/java/com/ning/billing/catalog/TestVersionedCatalog.java
+++ b/catalog/src/test/java/com/ning/billing/catalog/TestVersionedCatalog.java
@@ -15,17 +15,14 @@
  */
 package com.ning.billing.catalog;
 
-import static org.testng.AssertJUnit.assertEquals;
-
+import javax.xml.bind.JAXBException;
+import javax.xml.transform.TransformerException;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.util.Date;
 
-import javax.xml.bind.JAXBException;
-import javax.xml.transform.TransformerException;
-
 import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,72 +41,74 @@ import com.ning.billing.catalog.io.VersionedCatalogLoader;
 import com.ning.billing.lifecycle.KillbillService.ServiceException;
 import com.ning.billing.util.clock.DefaultClock;
 
+import static org.testng.AssertJUnit.assertEquals;
+
 public class TestVersionedCatalog {
-	private static final Logger log = LoggerFactory.getLogger(TestVersionedCatalog.class);
-	private final VersionedCatalogLoader loader = new VersionedCatalogLoader(new DefaultClock());
-	private VersionedCatalog vc;
-	
-	@BeforeClass(groups={"fast"})
-	public void setUp() throws ServiceException {
-		vc = loader.load(Resources.getResource("versionedCatalog").toString());
-	}
-
-	@Test(groups={"fast"},enabled=true)
-	public void testAddCatalog() throws MalformedURLException, IOException, SAXException, InvalidConfigException, JAXBException, TransformerException, URISyntaxException, ServiceException, CatalogApiException {
-		vc.add(new StandaloneCatalog(new Date()));
-		assertEquals(4, vc.size());
-	}
-	
-		
-	@Test(groups={"fast"},enabled=true)
-	public void testFindPlanWithDates() throws Exception {
-		DateTime dt0= new DateTime("2010-01-01T00:00:00+00:00");
-		DateTime dt1 = new DateTime("2011-01-01T00:01:00+00:00");
-		DateTime dt2 = new DateTime("2011-02-02T00:01:00+00:00");
-		DateTime dt214 = new DateTime("2011-02-14T00:01:00+00:00");
-		DateTime dt3 = new DateTime("2011-03-03T00:01:00+00:00");
-		
-		// New subscription
-		try {
-			vc.findPlan("pistol-monthly", dt0, dt0);	
-			Assert.fail("Exception should have been thrown there are no plans for this date");
-		} catch (CatalogApiException e) {
-			// Expected behaviour
-			log.error("Expected exception", e);
-			
-		}
-		Plan newSubPlan1 = vc.findPlan("pistol-monthly", dt1, dt1);
-		Plan newSubPlan2 = vc.findPlan("pistol-monthly", dt2, dt2);
-		Plan newSubPlan214 = vc.findPlan("pistol-monthly", dt214, dt214);
-		Plan newSubPlan3 = vc.findPlan("pistol-monthly", dt3, dt3);
-		
-		Assert.assertEquals(newSubPlan1.getAllPhases()[1].getRecurringPrice().getPrice(Currency.USD), new BigDecimal("1.0"));
-		Assert.assertEquals(newSubPlan2.getAllPhases()[1].getRecurringPrice().getPrice(Currency.USD), new BigDecimal("2.0"));
-		Assert.assertEquals(newSubPlan214.getAllPhases()[1].getRecurringPrice().getPrice(Currency.USD), new BigDecimal("2.0"));
-		Assert.assertEquals(newSubPlan3.getAllPhases()[1].getRecurringPrice().getPrice(Currency.USD), new BigDecimal("3.0"));
-		
-		// Existing subscription
-		
-		Plan exSubPlan2 = vc.findPlan("pistol-monthly", dt2, dt1);
-		Plan exSubPlan214 = vc.findPlan("pistol-monthly", dt214, dt1);
-		Plan exSubPlan3 = vc.findPlan("pistol-monthly", dt3, dt1);
-		
-		Assert.assertEquals(exSubPlan2.getAllPhases()[1].getRecurringPrice().getPrice(Currency.USD), new BigDecimal("1.0"));
-		Assert.assertEquals(exSubPlan214.getAllPhases()[1].getRecurringPrice().getPrice(Currency.USD), new BigDecimal("2.0"));
-		Assert.assertEquals(exSubPlan3.getAllPhases()[1].getRecurringPrice().getPrice(Currency.USD), new BigDecimal("2.0"));
-
-	}
-	
-	@Test(groups={"fast"},enabled=true)
-	public void testErrorOnDateTooEarly() {
-		DateTime dt0= new DateTime("1977-01-01T00:00:00+00:00");
-		try {
-			vc.findPlan("foo", dt0);
-			Assert.fail("Date is too early an exception should have been thrown");
-		} catch (CatalogApiException e) {
-			e.printStackTrace();
-			Assert.assertEquals(e.getCode(), ErrorCode.CAT_NO_CATALOG_FOR_GIVEN_DATE.getCode());
-
-		}
-	}
+    private static final Logger log = LoggerFactory.getLogger(TestVersionedCatalog.class);
+    private final VersionedCatalogLoader loader = new VersionedCatalogLoader(new DefaultClock());
+    private VersionedCatalog vc;
+
+    @BeforeClass(groups = {"fast"})
+    public void setUp() throws ServiceException {
+        vc = loader.load(Resources.getResource("versionedCatalog").toString());
+    }
+
+    @Test(groups = {"fast"}, enabled = true)
+    public void testAddCatalog() throws MalformedURLException, IOException, SAXException, InvalidConfigException, JAXBException, TransformerException, URISyntaxException, ServiceException, CatalogApiException {
+        vc.add(new StandaloneCatalog(new Date()));
+        assertEquals(4, vc.size());
+    }
+
+
+    @Test(groups = {"fast"}, enabled = true)
+    public void testFindPlanWithDates() throws Exception {
+        final DateTime dt0 = new DateTime("2010-01-01T00:00:00+00:00");
+        final DateTime dt1 = new DateTime("2011-01-01T00:01:00+00:00");
+        final DateTime dt2 = new DateTime("2011-02-02T00:01:00+00:00");
+        final DateTime dt214 = new DateTime("2011-02-14T00:01:00+00:00");
+        final DateTime dt3 = new DateTime("2011-03-03T00:01:00+00:00");
+
+        // New subscription
+        try {
+            vc.findPlan("pistol-monthly", dt0, dt0);
+            Assert.fail("Exception should have been thrown there are no plans for this date");
+        } catch (CatalogApiException e) {
+            // Expected behaviour
+            log.error("Expected exception", e);
+
+        }
+        final Plan newSubPlan1 = vc.findPlan("pistol-monthly", dt1, dt1);
+        final Plan newSubPlan2 = vc.findPlan("pistol-monthly", dt2, dt2);
+        final Plan newSubPlan214 = vc.findPlan("pistol-monthly", dt214, dt214);
+        final Plan newSubPlan3 = vc.findPlan("pistol-monthly", dt3, dt3);
+
+        Assert.assertEquals(newSubPlan1.getAllPhases()[1].getRecurringPrice().getPrice(Currency.USD), new BigDecimal("1.0"));
+        Assert.assertEquals(newSubPlan2.getAllPhases()[1].getRecurringPrice().getPrice(Currency.USD), new BigDecimal("2.0"));
+        Assert.assertEquals(newSubPlan214.getAllPhases()[1].getRecurringPrice().getPrice(Currency.USD), new BigDecimal("2.0"));
+        Assert.assertEquals(newSubPlan3.getAllPhases()[1].getRecurringPrice().getPrice(Currency.USD), new BigDecimal("3.0"));
+
+        // Existing subscription
+
+        final Plan exSubPlan2 = vc.findPlan("pistol-monthly", dt2, dt1);
+        final Plan exSubPlan214 = vc.findPlan("pistol-monthly", dt214, dt1);
+        final Plan exSubPlan3 = vc.findPlan("pistol-monthly", dt3, dt1);
+
+        Assert.assertEquals(exSubPlan2.getAllPhases()[1].getRecurringPrice().getPrice(Currency.USD), new BigDecimal("1.0"));
+        Assert.assertEquals(exSubPlan214.getAllPhases()[1].getRecurringPrice().getPrice(Currency.USD), new BigDecimal("2.0"));
+        Assert.assertEquals(exSubPlan3.getAllPhases()[1].getRecurringPrice().getPrice(Currency.USD), new BigDecimal("2.0"));
+
+    }
+
+    @Test(groups = {"fast"}, enabled = true)
+    public void testErrorOnDateTooEarly() {
+        final DateTime dt0 = new DateTime("1977-01-01T00:00:00+00:00");
+        try {
+            vc.findPlan("foo", dt0);
+            Assert.fail("Date is too early an exception should have been thrown");
+        } catch (CatalogApiException e) {
+            e.printStackTrace();
+            Assert.assertEquals(e.getCode(), ErrorCode.CAT_NO_CATALOG_FOR_GIVEN_DATE.getCode());
+
+        }
+    }
 }

diff --git a/catalog/src/test/java/com/ning/billing/mock/catalog/MockPlan.java b/catalog/src/test/java/com/ning/billing/mock/catalog/MockPlan.java
index 2199eb9..426c690 100644
--- a/catalog/src/test/java/com/ning/billing/mock/catalog/MockPlan.java
+++ b/catalog/src/test/java/com/ning/billing/mock/catalog/MockPlan.java
@@ -29,65 +29,65 @@ import com.ning.billing.catalog.api.Product;
 
 public class MockPlan implements Plan {
 
-	@Override
-	public PlanPhase[] getInitialPhases() {
-		return null;
-	}
-
-	@Override
-	public Product getProduct() {
-		return null;
-	}
-
-	@Override
-	public String getName() {
-		return null;
-	}
-
-	@Override
-	public boolean isRetired() {
-				return false;
-	}
-
-	@Override
-	public Iterator<PlanPhase> getInitialPhaseIterator() {
-				return null;
-	}
-
-	@Override
-	public PlanPhase getFinalPhase() {
-				return null;
-	}
-
-	@Override
-	public BillingPeriod getBillingPeriod() {
-				return null;
-	}
-
-	@Override
-	public int getPlansAllowedInBundle() {
-				return 0;
-	}
-
-	@Override
-	public PlanPhase[] getAllPhases() {
-				return null;
-	}
-
-	@Override
-	public Date getEffectiveDateForExistingSubscriptons() {
-				return null;
-	}
-
-	@Override
-	public PlanPhase findPhase(String name) throws CatalogApiException {
-				return null;
-	}
-
-	@Override
-	public DateTime dateOfFirstRecurringNonZeroCharge(
-			DateTime subscriptionStartDate) {
-				return null;
-	}
+    @Override
+    public PlanPhase[] getInitialPhases() {
+        return null;
+    }
+
+    @Override
+    public Product getProduct() {
+        return null;
+    }
+
+    @Override
+    public String getName() {
+        return null;
+    }
+
+    @Override
+    public boolean isRetired() {
+        return false;
+    }
+
+    @Override
+    public Iterator<PlanPhase> getInitialPhaseIterator() {
+        return null;
+    }
+
+    @Override
+    public PlanPhase getFinalPhase() {
+        return null;
+    }
+
+    @Override
+    public BillingPeriod getBillingPeriod() {
+        return null;
+    }
+
+    @Override
+    public int getPlansAllowedInBundle() {
+        return 0;
+    }
+
+    @Override
+    public PlanPhase[] getAllPhases() {
+        return null;
+    }
+
+    @Override
+    public Date getEffectiveDateForExistingSubscriptons() {
+        return null;
+    }
+
+    @Override
+    public PlanPhase findPhase(final String name) throws CatalogApiException {
+        return null;
+    }
+
+    @Override
+    public DateTime dateOfFirstRecurringNonZeroCharge(
+            final DateTime subscriptionStartDate) {
+        return null;
+    }
 
 }

diff --git a/entitlement/pom.xml b/entitlement/pom.xml
index 5f1d461..f816236 100644
--- a/entitlement/pom.xml
+++ b/entitlement/pom.xml
@@ -8,7 +8,8 @@
     OR CONDITIONS OF ANY KIND, either express or implied. See the ~ License for 
     the specific language governing permissions and limitations ~ under the License. -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.ning.billing</groupId>
@@ -46,7 +47,7 @@
             <artifactId>commons-io</artifactId>
             <scope>test</scope>
         </dependency>
-       <dependency>
+        <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
         </dependency>
@@ -74,7 +75,7 @@
             <artifactId>mysql-connector-mxj</artifactId>
             <scope>test</scope>
         </dependency>
-                <dependency>
+        <dependency>
             <groupId>com.ning.billing</groupId>
             <artifactId>killbill-catalog</artifactId>
             <type>test-jar</type>
@@ -85,13 +86,13 @@
             <artifactId>killbill-catalog</artifactId>
             <scope>test</scope>
         </dependency>
-         <dependency>
+        <dependency>
             <groupId>com.ning.billing</groupId>
             <artifactId>killbill-util</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
-       </dependency> 
-         <dependency>
+        </dependency>
+        <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
             <scope>test</scope>

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/alignment/MigrationPlanAligner.java b/entitlement/src/main/java/com/ning/billing/entitlement/alignment/MigrationPlanAligner.java
index 2965b8f..9283768 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/alignment/MigrationPlanAligner.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/alignment/MigrationPlanAligner.java
@@ -27,8 +27,8 @@ import com.ning.billing.catalog.api.PhaseType;
 import com.ning.billing.catalog.api.Plan;
 import com.ning.billing.catalog.api.PlanPhase;
 import com.ning.billing.catalog.api.PlanPhaseSpecifier;
-import com.ning.billing.entitlement.api.migration.EntitlementMigrationApiException;
 import com.ning.billing.entitlement.api.migration.EntitlementMigrationApi.EntitlementSubscriptionMigrationCase;
+import com.ning.billing.entitlement.api.migration.EntitlementMigrationApiException;
 import com.ning.billing.entitlement.events.EntitlementEvent.EventType;
 import com.ning.billing.entitlement.events.user.ApiEventType;
 import com.ning.billing.util.clock.DefaultClock;
@@ -38,45 +38,45 @@ public class MigrationPlanAligner {
     private final CatalogService catalogService;
 
     @Inject
-    public MigrationPlanAligner(CatalogService catalogService) {
+    public MigrationPlanAligner(final CatalogService catalogService) {
         this.catalogService = catalogService;
     }
 
 
-    public TimedMigration [] getEventsMigration(EntitlementSubscriptionMigrationCase [] input, DateTime now)
-        throws EntitlementMigrationApiException {
+    public TimedMigration[] getEventsMigration(final EntitlementSubscriptionMigrationCase[] input, final DateTime now)
+            throws EntitlementMigrationApiException {
 
         try {
-            TimedMigration [] events = null;
-            Plan plan0 = catalogService.getFullCatalog().findPlan(input[0].getPlanPhaseSpecifier().getProductName(),
-                    input[0].getPlanPhaseSpecifier().getBillingPeriod(), input[0].getPlanPhaseSpecifier().getPriceListName(), now);
+            TimedMigration[] events = null;
+            final Plan plan0 = catalogService.getFullCatalog().findPlan(input[0].getPlanPhaseSpecifier().getProductName(),
+                                                                  input[0].getPlanPhaseSpecifier().getBillingPeriod(), input[0].getPlanPhaseSpecifier().getPriceListName(), now);
 
-            Plan plan1 = (input.length > 1) ? catalogService.getFullCatalog().findPlan(input[1].getPlanPhaseSpecifier().getProductName(),
-                    input[1].getPlanPhaseSpecifier().getBillingPeriod(), input[1].getPlanPhaseSpecifier().getPriceListName(), now) :
-                        null;
+            final Plan plan1 = (input.length > 1) ? catalogService.getFullCatalog().findPlan(input[1].getPlanPhaseSpecifier().getProductName(),
+                                                                                       input[1].getPlanPhaseSpecifier().getBillingPeriod(), input[1].getPlanPhaseSpecifier().getPriceListName(), now) :
+                    null;
 
             DateTime migrationStartDate = now;
 
             if (isRegularMigratedSubscription(input)) {
 
                 events = getEventsOnRegularMigration(plan0,
-                        getPlanPhase(plan0, input[0].getPlanPhaseSpecifier().getPhaseType()),
-                        input[0].getPlanPhaseSpecifier().getPriceListName(),
-                        now);
+                                                     getPlanPhase(plan0, input[0].getPlanPhaseSpecifier().getPhaseType()),
+                                                     input[0].getPlanPhaseSpecifier().getPriceListName(),
+                                                     now);
 
             } else if (isRegularFutureCancelledMigratedSubscription(input)) {
 
                 events = getEventsOnFuturePlanCancelMigration(plan0,
-                        getPlanPhase(plan0, input[0].getPlanPhaseSpecifier().getPhaseType()),
-                        input[0].getPlanPhaseSpecifier().getPriceListName(),
-                        now,
-                        input[0].getCancelledDate());
+                                                              getPlanPhase(plan0, input[0].getPlanPhaseSpecifier().getPhaseType()),
+                                                              input[0].getPlanPhaseSpecifier().getPriceListName(),
+                                                              now,
+                                                              input[0].getCancelledDate());
 
             } else if (isPhaseChangeMigratedSubscription(input)) {
 
-                PhaseType curPhaseType = input[0].getPlanPhaseSpecifier().getPhaseType();
+                final PhaseType curPhaseType = input[0].getPlanPhaseSpecifier().getPhaseType();
                 Duration curPhaseDuration = null;
-                for (PlanPhase cur : plan0.getAllPhases()) {
+                for (final PlanPhase cur : plan0.getAllPhases()) {
                     if (cur.getPhaseType() == curPhaseType) {
                         curPhaseDuration = cur.getDuration();
                         break;
@@ -84,25 +84,25 @@ public class MigrationPlanAligner {
                 }
                 if (curPhaseDuration == null) {
                     throw new EntitlementMigrationApiException(String.format("Failed to compute current phase duration for plan %s and phase %s",
-                            plan0.getName(), curPhaseType));
+                                                                             plan0.getName(), curPhaseType));
                 }
 
                 migrationStartDate = DefaultClock.removeDuration(input[1].getEffectiveDate(), curPhaseDuration);
                 events = getEventsOnFuturePhaseChangeMigration(plan0,
-                        getPlanPhase(plan0, input[0].getPlanPhaseSpecifier().getPhaseType()),
-                        input[0].getPlanPhaseSpecifier().getPriceListName(),
-                        migrationStartDate,
-                        input[1].getEffectiveDate());
+                                                               getPlanPhase(plan0, input[0].getPlanPhaseSpecifier().getPhaseType()),
+                                                               input[0].getPlanPhaseSpecifier().getPriceListName(),
+                                                               migrationStartDate,
+                                                               input[1].getEffectiveDate());
 
             } else if (isPlanChangeMigratedSubscription(input)) {
 
                 events = getEventsOnFuturePlanChangeMigration(plan0,
-                        getPlanPhase(plan0, input[0].getPlanPhaseSpecifier().getPhaseType()),
-                        plan1,
-                        getPlanPhase(plan1, input[1].getPlanPhaseSpecifier().getPhaseType()),
-                        input[0].getPlanPhaseSpecifier().getPriceListName(),
-                        now,
-                        input[1].getEffectiveDate());
+                                                              getPlanPhase(plan0, input[0].getPlanPhaseSpecifier().getPhaseType()),
+                                                              plan1,
+                                                              getPlanPhase(plan1, input[1].getPlanPhaseSpecifier().getPhaseType()),
+                                                              input[0].getPlanPhaseSpecifier().getPriceListName(),
+                                                              now,
+                                                              input[1].getEffectiveDate());
 
             } else {
                 throw new EntitlementMigrationApiException("Unknown migration type");
@@ -114,20 +114,20 @@ public class MigrationPlanAligner {
         }
     }
 
-    private TimedMigration [] getEventsOnRegularMigration(Plan plan, PlanPhase initialPhase, String priceList, DateTime effectiveDate) {
-        TimedMigration [] result = new TimedMigration[1];
+    private TimedMigration[] getEventsOnRegularMigration(final Plan plan, final PlanPhase initialPhase, final String priceList, final DateTime effectiveDate) {
+        final TimedMigration[] result = new TimedMigration[1];
         result[0] = new TimedMigration(effectiveDate, EventType.API_USER, ApiEventType.MIGRATE_ENTITLEMENT, plan, initialPhase, priceList);
         return result;
     }
 
-    private TimedMigration [] getEventsOnFuturePhaseChangeMigration(Plan plan, PlanPhase initialPhase, String priceList, DateTime effectiveDate, DateTime effectiveDateForNextPhase)
-        throws EntitlementMigrationApiException {
+    private TimedMigration[] getEventsOnFuturePhaseChangeMigration(final Plan plan, final PlanPhase initialPhase, final String priceList, final DateTime effectiveDate, final DateTime effectiveDateForNextPhase)
+            throws EntitlementMigrationApiException {
 
-        TimedMigration [] result = new TimedMigration[2];
+        final TimedMigration[] result = new TimedMigration[2];
         result[0] = new TimedMigration(effectiveDate, EventType.API_USER, ApiEventType.MIGRATE_ENTITLEMENT, plan, initialPhase, priceList);
         boolean foundCurrent = false;
         PlanPhase nextPhase = null;
-        for (PlanPhase cur : plan.getAllPhases()) {
+        for (final PlanPhase cur : plan.getAllPhases()) {
             if (cur == initialPhase) {
                 foundCurrent = true;
                 continue;
@@ -138,21 +138,21 @@ public class MigrationPlanAligner {
         }
         if (nextPhase == null) {
             throw new EntitlementMigrationApiException(String.format("Cannot find next phase for Plan %s and current Phase %s",
-                        plan.getName(), initialPhase.getName()));
+                                                                     plan.getName(), initialPhase.getName()));
         }
         result[1] = new TimedMigration(effectiveDateForNextPhase, EventType.PHASE, null, plan, nextPhase, priceList);
         return result;
     }
 
-    private TimedMigration [] getEventsOnFuturePlanChangeMigration(Plan currentPlan, PlanPhase currentPhase, Plan newPlan, PlanPhase newPhase, String priceList, DateTime effectiveDate, DateTime effectiveDateForChangePlan) {
-        TimedMigration [] result = new TimedMigration[2];
+    private TimedMigration[] getEventsOnFuturePlanChangeMigration(final Plan currentPlan, final PlanPhase currentPhase, final Plan newPlan, final PlanPhase newPhase, final String priceList, final DateTime effectiveDate, final DateTime effectiveDateForChangePlan) {
+        final TimedMigration[] result = new TimedMigration[2];
         result[0] = new TimedMigration(effectiveDate, EventType.API_USER, ApiEventType.MIGRATE_ENTITLEMENT, currentPlan, currentPhase, priceList);
         result[1] = new TimedMigration(effectiveDateForChangePlan, EventType.API_USER, ApiEventType.CHANGE, newPlan, newPhase, priceList);
         return result;
     }
 
-    private TimedMigration [] getEventsOnFuturePlanCancelMigration(Plan plan, PlanPhase initialPhase, String priceList, DateTime effectiveDate, DateTime effectiveDateForCancellation) {
-        TimedMigration [] result = new TimedMigration[2];
+    private TimedMigration[] getEventsOnFuturePlanCancelMigration(final Plan plan, final PlanPhase initialPhase, final String priceList, final DateTime effectiveDate, final DateTime effectiveDateForCancellation) {
+        final TimedMigration[] result = new TimedMigration[2];
         result[0] = new TimedMigration(effectiveDate, EventType.API_USER, ApiEventType.MIGRATE_ENTITLEMENT, plan, initialPhase, priceList);
         result[1] = new TimedMigration(effectiveDateForCancellation, EventType.API_USER, ApiEventType.CANCEL, null, null, null);
         return result;
@@ -160,8 +160,8 @@ public class MigrationPlanAligner {
 
 
     // STEPH should be in catalog
-    private PlanPhase getPlanPhase(Plan plan, PhaseType phaseType) throws EntitlementMigrationApiException {
-        for (PlanPhase cur: plan.getAllPhases()) {
+    private PlanPhase getPlanPhase(final Plan plan, final PhaseType phaseType) throws EntitlementMigrationApiException {
+        for (final PlanPhase cur : plan.getAllPhases()) {
             if (cur.getPhaseType() == phaseType) {
                 return cur;
             }
@@ -169,15 +169,15 @@ public class MigrationPlanAligner {
         throw new EntitlementMigrationApiException(String.format("Cannot find PlanPhase from Plan %s and type %s", plan.getName(), phaseType));
     }
 
-    private boolean isRegularMigratedSubscription(EntitlementSubscriptionMigrationCase [] input) {
+    private boolean isRegularMigratedSubscription(final EntitlementSubscriptionMigrationCase[] input) {
         return (input.length == 1 && input[0].getCancelledDate() == null);
     }
 
-    private boolean isRegularFutureCancelledMigratedSubscription(EntitlementSubscriptionMigrationCase [] input) {
+    private boolean isRegularFutureCancelledMigratedSubscription(final EntitlementSubscriptionMigrationCase[] input) {
         return (input.length == 1 && input[0].getCancelledDate() != null);
     }
 
-    private boolean isPhaseChangeMigratedSubscription(EntitlementSubscriptionMigrationCase [] input) {
+    private boolean isPhaseChangeMigratedSubscription(final EntitlementSubscriptionMigrationCase[] input) {
         if (input.length != 2) {
             return false;
         }
@@ -185,14 +185,14 @@ public class MigrationPlanAligner {
                 !isSamePhase(input[0].getPlanPhaseSpecifier(), input[1].getPlanPhaseSpecifier()));
     }
 
-    private boolean isPlanChangeMigratedSubscription(EntitlementSubscriptionMigrationCase [] input) {
+    private boolean isPlanChangeMigratedSubscription(final EntitlementSubscriptionMigrationCase[] input) {
         if (input.length != 2) {
             return false;
         }
-        return ! isSamePlan(input[0].getPlanPhaseSpecifier(), input[1].getPlanPhaseSpecifier());
+        return !isSamePlan(input[0].getPlanPhaseSpecifier(), input[1].getPlanPhaseSpecifier());
     }
 
-    private boolean isSamePlan(PlanPhaseSpecifier plan0, PlanPhaseSpecifier plan1) {
+    private boolean isSamePlan(final PlanPhaseSpecifier plan0, final PlanPhaseSpecifier plan1) {
         if (plan0.getPriceListName().equals(plan1.getPriceListName()) &&
                 plan0.getProductName().equals(plan1.getProductName()) &&
                 plan0.getBillingPeriod() == plan1.getBillingPeriod()) {
@@ -201,7 +201,7 @@ public class MigrationPlanAligner {
         return false;
     }
 
-    private boolean isSamePhase(PlanPhaseSpecifier plan0, PlanPhaseSpecifier plan1) {
+    private boolean isSamePhase(final PlanPhaseSpecifier plan0, final PlanPhaseSpecifier plan1) {
         if (plan0.getPhaseType() == plan1.getPhaseType()) {
             return true;
         }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/alignment/PlanAligner.java b/entitlement/src/main/java/com/ning/billing/entitlement/alignment/PlanAligner.java
index 0e44528..d31452d 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/alignment/PlanAligner.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/alignment/PlanAligner.java
@@ -16,32 +16,42 @@
 
 package com.ning.billing.entitlement.alignment;
 
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.joda.time.DateTime;
+
 import com.google.inject.Inject;
 import com.ning.billing.ErrorCode;
-import com.ning.billing.catalog.api.*;
+import com.ning.billing.catalog.api.Catalog;
+import com.ning.billing.catalog.api.CatalogApiException;
+import com.ning.billing.catalog.api.CatalogService;
+import com.ning.billing.catalog.api.Duration;
+import com.ning.billing.catalog.api.PhaseType;
+import com.ning.billing.catalog.api.Plan;
+import com.ning.billing.catalog.api.PlanAlignmentChange;
+import com.ning.billing.catalog.api.PlanAlignmentCreate;
+import com.ning.billing.catalog.api.PlanPhase;
+import com.ning.billing.catalog.api.PlanPhaseSpecifier;
+import com.ning.billing.catalog.api.PlanSpecifier;
+import com.ning.billing.catalog.api.ProductCategory;
 import com.ning.billing.entitlement.api.user.EntitlementUserApiException;
 import com.ning.billing.entitlement.api.user.SubscriptionData;
 import com.ning.billing.entitlement.api.user.SubscriptionTransitionData;
 import com.ning.billing.entitlement.exceptions.EntitlementError;
 import com.ning.billing.util.clock.DefaultClock;
-import org.joda.time.DateTime;
-
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
 
 /**
- *
  * PlanAligner offers specific APIs to return the correct {@code TimedPhase} when creating, changing Plan or to compute next Phase on current Plan.
- * <p>
- *
+ * <p/>
  */
-public class PlanAligner  {
+public class PlanAligner {
 
     private final CatalogService catalogService;
 
     @Inject
-    public PlanAligner(CatalogService catalogService) {
+    public PlanAligner(final CatalogService catalogService) {
         this.catalogService = catalogService;
     }
 
@@ -52,106 +62,109 @@ public class PlanAligner  {
 
     /**
      * Returns the current and next phase for the subscription in creation
-     * <p>
-     * @param subscription the subscription in creation
-     * @param plan the current Plan
-     * @param initialPhase the initialPhase on which we should create that subscription. can be null
-     * @param priceList the priceList
+     * <p/>
+     *
+     * @param subscription  the subscription in creation
+     * @param plan          the current Plan
+     * @param initialPhase  the initialPhase on which we should create that subscription. can be null
+     * @param priceList     the priceList
      * @param effectiveDate the effective creation date
      * @return
      * @throws CatalogApiException
      * @throws EntitlementUserApiException
      */
-    public TimedPhase [] getCurrentAndNextTimedPhaseOnCreate(final SubscriptionData subscription,
-            final Plan plan, final PhaseType initialPhase, final String priceList, final DateTime requestedDate, final DateTime effectiveDate)
-        throws CatalogApiException, EntitlementUserApiException {
-        List<TimedPhase> timedPhases = getTimedPhaseOnCreate(subscription.getStartDate(),
-                subscription.getBundleStartDate(), plan, initialPhase, priceList, requestedDate);
-        TimedPhase [] result = new TimedPhase[2];
+    public TimedPhase[] getCurrentAndNextTimedPhaseOnCreate(final SubscriptionData subscription,
+                                                            final Plan plan, final PhaseType initialPhase, final String priceList, final DateTime requestedDate, final DateTime effectiveDate)
+            throws CatalogApiException, EntitlementUserApiException {
+        final List<TimedPhase> timedPhases = getTimedPhaseOnCreate(subscription.getStartDate(),
+                                                             subscription.getBundleStartDate(), plan, initialPhase, priceList, requestedDate);
+        final TimedPhase[] result = new TimedPhase[2];
         result[0] = getTimedPhase(timedPhases, effectiveDate, WhichPhase.CURRENT);
         result[1] = getTimedPhase(timedPhases, effectiveDate, WhichPhase.NEXT);
         return result;
     }
 
     /**
-     *
      * Returns current Phase for that Plan change
-     * <p>
-     * @param subscription the subscription in creation
-     * @param plan the current Plan
-     * @param priceList the priceList on which we should change that subscription.
+     * <p/>
+     *
+     * @param subscription  the subscription in creation
+     * @param plan          the current Plan
+     * @param priceList     the priceList on which we should change that subscription.
      * @param effectiveDate the effective change date
      * @return
      * @throws CatalogApiException
      * @throws EntitlementUserApiException
      */
     public TimedPhase getCurrentTimedPhaseOnChange(final SubscriptionData subscription,
-            final Plan plan, final String priceList, final DateTime requestedDate, final DateTime effectiveDate)
-        throws CatalogApiException, EntitlementUserApiException {
+                                                   final Plan plan, final String priceList, final DateTime requestedDate, final DateTime effectiveDate)
+            throws CatalogApiException, EntitlementUserApiException {
         return getTimedPhaseOnChange(subscription, plan, priceList, requestedDate, effectiveDate, WhichPhase.CURRENT);
     }
 
     /**
      * Returns next Phase for that Plan change
-     * <p>
-     * @param subscription the subscription in creation
-     * @param plan the current Plan
-     * @param priceList the priceList on which we should change that subscription.
+     * <p/>
+     *
+     * @param subscription  the subscription in creation
+     * @param plan          the current Plan
+     * @param priceList     the priceList on which we should change that subscription.
      * @param effectiveDate the effective change date
      * @return
      * @throws CatalogApiException
      * @throws EntitlementUserApiException
      */
     public TimedPhase getNextTimedPhaseOnChange(final SubscriptionData subscription,
-            final Plan plan, final String priceList, final DateTime requestedDate, final DateTime effectiveDate)
-        throws CatalogApiException, EntitlementUserApiException {
+                                                final Plan plan, final String priceList, final DateTime requestedDate, final DateTime effectiveDate)
+            throws CatalogApiException, EntitlementUserApiException {
         return getTimedPhaseOnChange(subscription, plan, priceList, requestedDate, effectiveDate, WhichPhase.NEXT);
     }
 
 
     /**
      * Returns next Phase for that Subscription at a point in time
-     * <p>
-     * @param subscription the subscription for which we need to compute the next Phase event
+     * <p/>
+     *
+     * @param subscription  the subscription for which we need to compute the next Phase event
      * @param effectiveDate the date at which we look to compute that event. effective needs to be after last Plan change or initial Plan
      * @return The PhaseEvent at the correct point in time
      */
     public TimedPhase getNextTimedPhase(final SubscriptionData subscription, final DateTime requestedDate, final DateTime effectiveDate) {
         try {
 
-            SubscriptionTransitionData lastPlanTransition = subscription.getInitialTransitionForCurrentPlan();
+            final SubscriptionTransitionData lastPlanTransition = subscription.getInitialTransitionForCurrentPlan();
             if (effectiveDate.isBefore(lastPlanTransition.getEffectiveTransitionTime())) {
                 throw new EntitlementError(String.format("Cannot specify an effectiveDate prior to last Plan Change, subscription = %s, effectiveDate = %s",
-                        subscription.getId(), effectiveDate));
+                                                         subscription.getId(), effectiveDate));
             }
 
-            switch(lastPlanTransition.getTransitionType()) {
-            // If we never had any Plan change, borrow the logics for createPlan alignment
-            case MIGRATE_ENTITLEMENT:
-            case CREATE:
-            case RE_CREATE:                
-                List<TimedPhase> timedPhases = getTimedPhaseOnCreate(subscription.getStartDate(),
-                        subscription.getBundleStartDate(),
-                        lastPlanTransition.getNextPlan(),
-                        lastPlanTransition.getNextPhase().getPhaseType(),
-                        lastPlanTransition.getNextPriceList().getName(),
-                        requestedDate);
-                return getTimedPhase(timedPhases, effectiveDate, WhichPhase.NEXT);
-            // If we went through Plan changes, borrow the logics for changePlan alignement
-            case CHANGE:
-                return getTimedPhaseOnChange(subscription.getStartDate(),
-                        subscription.getBundleStartDate(),
-                        lastPlanTransition.getPreviousPhase(),
-                        lastPlanTransition.getPreviousPlan(),
-                        lastPlanTransition.getPreviousPriceList().getName(),
-                        lastPlanTransition.getNextPlan(),
-                        lastPlanTransition.getNextPriceList().getName(),
-                        requestedDate,
-                        effectiveDate,
-                        WhichPhase.NEXT);
-            default:
-                throw new EntitlementError(String.format("Unexpectd initial transition %s for current plan %s on subscription %s",
-                        lastPlanTransition.getTransitionType(), subscription.getCurrentPlan(), subscription.getId()));
+            switch (lastPlanTransition.getTransitionType()) {
+                // If we never had any Plan change, borrow the logics for createPlan alignment
+                case MIGRATE_ENTITLEMENT:
+                case CREATE:
+                case RE_CREATE:
+                    final List<TimedPhase> timedPhases = getTimedPhaseOnCreate(subscription.getStartDate(),
+                                                                         subscription.getBundleStartDate(),
+                                                                         lastPlanTransition.getNextPlan(),
+                                                                         lastPlanTransition.getNextPhase().getPhaseType(),
+                                                                         lastPlanTransition.getNextPriceList().getName(),
+                                                                         requestedDate);
+                    return getTimedPhase(timedPhases, effectiveDate, WhichPhase.NEXT);
+                // If we went through Plan changes, borrow the logics for changePlan alignement
+                case CHANGE:
+                    return getTimedPhaseOnChange(subscription.getStartDate(),
+                                                 subscription.getBundleStartDate(),
+                                                 lastPlanTransition.getPreviousPhase(),
+                                                 lastPlanTransition.getPreviousPlan(),
+                                                 lastPlanTransition.getPreviousPriceList().getName(),
+                                                 lastPlanTransition.getNextPlan(),
+                                                 lastPlanTransition.getNextPriceList().getName(),
+                                                 requestedDate,
+                                                 effectiveDate,
+                                                 WhichPhase.NEXT);
+                default:
+                    throw new EntitlementError(String.format("Unexpectd initial transition %s for current plan %s on subscription %s",
+                                                             lastPlanTransition.getTransitionType(), subscription.getCurrentPlan(), subscription.getId()));
             }
         } catch (Exception /* EntitlementUserApiException, CatalogApiException */ e) {
             throw new EntitlementError(String.format("Could not compute next phase change for subscription %s", subscription.getId()), e);
@@ -159,102 +172,102 @@ public class PlanAligner  {
     }
 
 
-    private List<TimedPhase> getTimedPhaseOnCreate(DateTime subscriptionStartDate,
-            DateTime bundleStartDate,
-            Plan plan, PhaseType initialPhase, String priceList, DateTime requestedDate)
-        throws CatalogApiException, EntitlementUserApiException  {
+    private List<TimedPhase> getTimedPhaseOnCreate(final DateTime subscriptionStartDate,
+                                                   final DateTime bundleStartDate,
+                                                   final Plan plan, final PhaseType initialPhase, final String priceList, final DateTime requestedDate)
+            throws CatalogApiException, EntitlementUserApiException {
 
-        Catalog catalog = catalogService.getFullCatalog();
+        final Catalog catalog = catalogService.getFullCatalog();
 
-        PlanSpecifier planSpecifier = new PlanSpecifier(plan.getProduct().getName(),
-                plan.getProduct().getCategory(),
-                plan.getBillingPeriod(),
-                priceList);
+        final PlanSpecifier planSpecifier = new PlanSpecifier(plan.getProduct().getName(),
+                                                        plan.getProduct().getCategory(),
+                                                        plan.getBillingPeriod(),
+                                                        priceList);
 
         DateTime planStartDate = null;
-        PlanAlignmentCreate alignement = catalog.planCreateAlignment(planSpecifier, requestedDate);
-        switch(alignement) {
-        case START_OF_SUBSCRIPTION:
-            planStartDate = subscriptionStartDate;
-            break;
-        case START_OF_BUNDLE:
-            planStartDate = bundleStartDate;
-            break;
-        default:
-            throw new EntitlementError(String.format("Unknwon PlanAlignmentCreate %s", alignement));
+        final PlanAlignmentCreate alignement = catalog.planCreateAlignment(planSpecifier, requestedDate);
+        switch (alignement) {
+            case START_OF_SUBSCRIPTION:
+                planStartDate = subscriptionStartDate;
+                break;
+            case START_OF_BUNDLE:
+                planStartDate = bundleStartDate;
+                break;
+            default:
+                throw new EntitlementError(String.format("Unknwon PlanAlignmentCreate %s", alignement));
         }
         return getPhaseAlignments(plan, initialPhase, planStartDate);
     }
 
-    private TimedPhase getTimedPhaseOnChange(SubscriptionData subscription,
-            Plan nextPlan, String nextPriceList, DateTime requestedDate, DateTime effectiveDate, WhichPhase which)
-        throws CatalogApiException, EntitlementUserApiException {
+    private TimedPhase getTimedPhaseOnChange(final SubscriptionData subscription,
+                                             final Plan nextPlan, final String nextPriceList, final DateTime requestedDate, final DateTime effectiveDate, final WhichPhase which)
+            throws CatalogApiException, EntitlementUserApiException {
         return getTimedPhaseOnChange(subscription.getStartDate(),
-                subscription.getBundleStartDate(),
-                subscription.getCurrentPhase(),
-                subscription.getCurrentPlan(),
-                subscription.getCurrentPriceList().getName(),
-                nextPlan,
-                nextPriceList,
-                requestedDate,
-                effectiveDate,
-                which);
+                                     subscription.getBundleStartDate(),
+                                     subscription.getCurrentPhase(),
+                                     subscription.getCurrentPlan(),
+                                     subscription.getCurrentPriceList().getName(),
+                                     nextPlan,
+                                     nextPriceList,
+                                     requestedDate,
+                                     effectiveDate,
+                                     which);
     }
 
 
-    private TimedPhase getTimedPhaseOnChange(DateTime subscriptionStartDate,
-            DateTime bundleStartDate,
-            PlanPhase currentPhase,
-            Plan currentPlan,
-            String currentPriceList,
-            Plan nextPlan, String priceList, DateTime requestedDate, DateTime effectiveDate, WhichPhase which)
-        throws CatalogApiException, EntitlementUserApiException {
+    private TimedPhase getTimedPhaseOnChange(final DateTime subscriptionStartDate,
+                                             final DateTime bundleStartDate,
+                                             final PlanPhase currentPhase,
+                                             final Plan currentPlan,
+                                             final String currentPriceList,
+                                             final Plan nextPlan, final String priceList, final DateTime requestedDate, final DateTime effectiveDate, final WhichPhase which)
+            throws CatalogApiException, EntitlementUserApiException {
 
-        Catalog catalog = catalogService.getFullCatalog();
-        ProductCategory currentCategory = currentPlan.getProduct().getCategory();
-        PlanPhaseSpecifier fromPlanPhaseSpecifier = new PlanPhaseSpecifier(currentPlan.getProduct().getName(),
-                currentCategory,
-                currentPlan.getBillingPeriod(),
-                currentPriceList,
-                currentPhase.getPhaseType());
+        final Catalog catalog = catalogService.getFullCatalog();
+        final ProductCategory currentCategory = currentPlan.getProduct().getCategory();
+        final PlanPhaseSpecifier fromPlanPhaseSpecifier = new PlanPhaseSpecifier(currentPlan.getProduct().getName(),
+                                                                           currentCategory,
+                                                                           currentPlan.getBillingPeriod(),
+                                                                           currentPriceList,
+                                                                           currentPhase.getPhaseType());
 
-        PlanSpecifier toPlanSpecifier = new PlanSpecifier(nextPlan.getProduct().getName(),
-                nextPlan.getProduct().getCategory(),
-                nextPlan.getBillingPeriod(),
-                priceList);
+        final PlanSpecifier toPlanSpecifier = new PlanSpecifier(nextPlan.getProduct().getName(),
+                                                          nextPlan.getProduct().getCategory(),
+                                                          nextPlan.getBillingPeriod(),
+                                                          priceList);
 
         DateTime planStartDate = null;
-        PlanAlignmentChange alignment = catalog.planChangeAlignment(fromPlanPhaseSpecifier, toPlanSpecifier, requestedDate);
-        switch(alignment) {
-        case START_OF_SUBSCRIPTION:
-            planStartDate = subscriptionStartDate;
-            break;
-        case START_OF_BUNDLE:
-            planStartDate = bundleStartDate;
-            break;
-        case CHANGE_OF_PLAN:
-            planStartDate = requestedDate;
-            break;
-        case CHANGE_OF_PRICELIST:
-            throw new EntitlementError(String.format("Not implemented yet %s", alignment));
-        default:
-            throw new EntitlementError(String.format("Unknwon PlanAlignmentChange %s", alignment));
+        final PlanAlignmentChange alignment = catalog.planChangeAlignment(fromPlanPhaseSpecifier, toPlanSpecifier, requestedDate);
+        switch (alignment) {
+            case START_OF_SUBSCRIPTION:
+                planStartDate = subscriptionStartDate;
+                break;
+            case START_OF_BUNDLE:
+                planStartDate = bundleStartDate;
+                break;
+            case CHANGE_OF_PLAN:
+                planStartDate = requestedDate;
+                break;
+            case CHANGE_OF_PRICELIST:
+                throw new EntitlementError(String.format("Not implemented yet %s", alignment));
+            default:
+                throw new EntitlementError(String.format("Unknwon PlanAlignmentChange %s", alignment));
         }
-        List<TimedPhase> timedPhases = getPhaseAlignments(nextPlan, null, planStartDate);
+        final List<TimedPhase> timedPhases = getPhaseAlignments(nextPlan, null, planStartDate);
         return getTimedPhase(timedPhases, effectiveDate, which);
     }
 
 
-    private List<TimedPhase> getPhaseAlignments(Plan plan, PhaseType initialPhase, DateTime initialPhaseStartDate)
-        throws EntitlementUserApiException {
+    private List<TimedPhase> getPhaseAlignments(final Plan plan, final PhaseType initialPhase, final DateTime initialPhaseStartDate)
+            throws EntitlementUserApiException {
         if (plan == null) {
             return Collections.emptyList();
         }
 
-        List<TimedPhase> result = new LinkedList<TimedPhase>();
+        final List<TimedPhase> result = new LinkedList<TimedPhase>();
         DateTime curPhaseStart = (initialPhase == null) ? initialPhaseStartDate : null;
         DateTime nextPhaseStart = null;
-        for (PlanPhase cur : plan.getAllPhases()) {
+        for (final PlanPhase cur : plan.getAllPhases()) {
             // For create we can specify the phase so skip any phase until we reach initialPhase
             if (curPhaseStart == null) {
                 if (initialPhase != cur.getPhaseType()) {
@@ -267,11 +280,11 @@ public class PlanAligner  {
 
             // STEPH check for duration null instead TimeUnit UNLIMITED
             if (cur.getPhaseType() != PhaseType.EVERGREEN) {
-                Duration curPhaseDuration = cur.getDuration();
+                final Duration curPhaseDuration = cur.getDuration();
                 nextPhaseStart = DefaultClock.addDuration(curPhaseStart, curPhaseDuration);
                 if (nextPhaseStart == null) {
                     throw new EntitlementError(String.format("Unexpected non ending UNLIMITED phase for plan %s",
-                            plan.getName()));
+                                                             plan.getName()));
                 }
                 curPhaseStart = nextPhaseStart;
             }
@@ -283,23 +296,23 @@ public class PlanAligner  {
     }
 
     // STEPH check for non evergreen Plans and what happens
-    private TimedPhase getTimedPhase(List<TimedPhase> timedPhases, DateTime effectiveDate, WhichPhase which) {
+    private TimedPhase getTimedPhase(final List<TimedPhase> timedPhases, final DateTime effectiveDate, final WhichPhase which) {
         TimedPhase cur = null;
         TimedPhase next = null;
-        for (TimedPhase phase : timedPhases) {
+        for (final TimedPhase phase : timedPhases) {
             if (phase.getStartPhase().isAfter(effectiveDate)) {
                 next = phase;
                 break;
             }
             cur = phase;
         }
-        switch(which) {
-        case CURRENT:
-            return cur;
-        case NEXT:
-            return next;
-        default:
-            throw new EntitlementError(String.format("Unexpected %s TimedPhase", which));
+        switch (which) {
+            case CURRENT:
+                return cur;
+            case NEXT:
+                return next;
+            default:
+                throw new EntitlementError(String.format("Unexpected %s TimedPhase", which));
         }
     }
 }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/alignment/TimedMigration.java b/entitlement/src/main/java/com/ning/billing/entitlement/alignment/TimedMigration.java
index e1ad564..c692ca5 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/alignment/TimedMigration.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/alignment/TimedMigration.java
@@ -34,8 +34,8 @@ public class TimedMigration {
     private final String priceList;
 
 
-    public TimedMigration(DateTime eventTime, EventType eventType,
-            ApiEventType apiEventType, Plan plan, PlanPhase phase, String priceList) {
+    public TimedMigration(final DateTime eventTime, final EventType eventType,
+                          final ApiEventType apiEventType, final Plan plan, final PlanPhase phase, final String priceList) {
         super();
         this.eventTime = eventTime;
         this.eventType = eventType;

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/alignment/TimedPhase.java b/entitlement/src/main/java/com/ning/billing/entitlement/alignment/TimedPhase.java
index 889d0ac..fb7bc1b 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/alignment/TimedPhase.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/alignment/TimedPhase.java
@@ -16,16 +16,17 @@
 
 package com.ning.billing.entitlement.alignment;
 
-import com.ning.billing.catalog.api.PlanPhase;
 import org.joda.time.DateTime;
 
+import com.ning.billing.catalog.api.PlanPhase;
+
 
 public final class TimedPhase {
 
     private final PlanPhase phase;
     private final DateTime startPhase;
 
-    public TimedPhase(PlanPhase phase, DateTime startPhase) {
+    public TimedPhase(final PlanPhase phase, final DateTime startPhase) {
         super();
         this.phase = phase;
         this.startPhase = startPhase;

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultChargeThruApi.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultChargeThruApi.java
index 21b97f8..8468183 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultChargeThruApi.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultChargeThruApi.java
@@ -30,26 +30,26 @@ import com.ning.billing.util.callcontext.CallContext;
 public class DefaultChargeThruApi implements ChargeThruApi {
     private final EntitlementDao entitlementDao;
     private final SubscriptionFactory subscriptionFactory;
-  
+
     @Inject
     public DefaultChargeThruApi(final SubscriptionFactory subscriptionFactory, final EntitlementDao dao) {
         super();
         this.subscriptionFactory = subscriptionFactory;
         this.entitlementDao = dao;
     }
-    
+
     @Override
     public UUID getAccountIdFromSubscriptionId(final UUID subscriptionId) {
         return entitlementDao.getAccountIdFromSubscriptionId(subscriptionId);
     }
 
     @Override
-    public void setChargedThroughDate(final UUID subscriptionId, final DateTime ctd, CallContext context) {
-        SubscriptionData subscription = (SubscriptionData) entitlementDao.getSubscriptionFromId(subscriptionFactory, subscriptionId);
+    public void setChargedThroughDate(final UUID subscriptionId, final DateTime ctd, final CallContext context) {
+        final SubscriptionData subscription = (SubscriptionData) entitlementDao.getSubscriptionFromId(subscriptionFactory, subscriptionId);
 
-        SubscriptionBuilder builder = new SubscriptionBuilder(subscription)
-            .setChargedThroughDate(ctd)
-            .setPaidThroughDate(subscription.getPaidThroughDate());
+        final SubscriptionBuilder builder = new SubscriptionBuilder(subscription)
+                .setChargedThroughDate(ctd)
+                .setPaidThroughDate(subscription.getPaidThroughDate());
         entitlementDao.updateChargedThroughDate(new SubscriptionData(builder), context);
     }
 }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/migration/AccountMigrationData.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/migration/AccountMigrationData.java
index 07a0034..560516e 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/migration/AccountMigrationData.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/migration/AccountMigrationData.java
@@ -18,9 +18,9 @@ package com.ning.billing.entitlement.api.migration;
 
 import java.util.List;
 
+import com.ning.billing.entitlement.api.user.DefaultSubscriptionFactory.SubscriptionBuilder;
 import com.ning.billing.entitlement.api.user.SubscriptionBundleData;
 import com.ning.billing.entitlement.api.user.SubscriptionData;
-import com.ning.billing.entitlement.api.user.DefaultSubscriptionFactory.SubscriptionBuilder;
 import com.ning.billing.entitlement.events.EntitlementEvent;
 import com.ning.billing.entitlement.events.user.ApiEventMigrateBilling;
 
@@ -28,7 +28,7 @@ public class AccountMigrationData {
 
     private final List<BundleMigrationData> data;
 
-    public AccountMigrationData(List<BundleMigrationData> data) {
+    public AccountMigrationData(final List<BundleMigrationData> data) {
         super();
         this.data = data;
     }
@@ -42,8 +42,8 @@ public class AccountMigrationData {
         private final SubscriptionBundleData data;
         private final List<SubscriptionMigrationData> subscriptions;
 
-        public BundleMigrationData(SubscriptionBundleData data,
-                List<SubscriptionMigrationData> subscriptions) {
+        public BundleMigrationData(final SubscriptionBundleData data,
+                                   final List<SubscriptionMigrationData> subscriptions) {
             super();
             this.data = data;
             this.subscriptions = subscriptions;
@@ -63,12 +63,12 @@ public class AccountMigrationData {
         private final SubscriptionData data;
         private final List<EntitlementEvent> initialEvents;
 
-        public SubscriptionMigrationData(SubscriptionData data,
-                    List<EntitlementEvent> initialEvents) {
+        public SubscriptionMigrationData(final SubscriptionData data,
+                                         final List<EntitlementEvent> initialEvents) {
             super();
             // Set CTD to subscription object from MIGRATION_BILLING event
-            SubscriptionBuilder builder = new SubscriptionBuilder(data);
-            for (EntitlementEvent cur : initialEvents) {
+            final SubscriptionBuilder builder = new SubscriptionBuilder(data);
+            for (final EntitlementEvent cur : initialEvents) {
                 if (cur instanceof ApiEventMigrateBilling) {
                     builder.setChargedThroughDate(cur.getEffectiveDate());
                 }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/migration/DefaultEntitlementMigrationApi.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/migration/DefaultEntitlementMigrationApi.java
index b09fc17..ee4bc32 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/migration/DefaultEntitlementMigrationApi.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/migration/DefaultEntitlementMigrationApi.java
@@ -23,7 +23,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.UUID;
 
-import com.ning.billing.util.callcontext.CallContext;
 import org.joda.time.DateTime;
 
 import com.google.common.collect.Lists;
@@ -34,9 +33,9 @@ import com.ning.billing.entitlement.alignment.TimedMigration;
 import com.ning.billing.entitlement.api.SubscriptionFactory;
 import com.ning.billing.entitlement.api.migration.AccountMigrationData.BundleMigrationData;
 import com.ning.billing.entitlement.api.migration.AccountMigrationData.SubscriptionMigrationData;
+import com.ning.billing.entitlement.api.user.DefaultSubscriptionFactory.SubscriptionBuilder;
 import com.ning.billing.entitlement.api.user.SubscriptionBundleData;
 import com.ning.billing.entitlement.api.user.SubscriptionData;
-import com.ning.billing.entitlement.api.user.DefaultSubscriptionFactory.SubscriptionBuilder;
 import com.ning.billing.entitlement.engine.dao.EntitlementDao;
 import com.ning.billing.entitlement.events.EntitlementEvent;
 import com.ning.billing.entitlement.events.EntitlementEvent.EventType;
@@ -50,6 +49,7 @@ import com.ning.billing.entitlement.events.user.ApiEventMigrateBilling;
 import com.ning.billing.entitlement.events.user.ApiEventMigrateEntitlement;
 import com.ning.billing.entitlement.events.user.ApiEventType;
 import com.ning.billing.entitlement.exceptions.EntitlementError;
+import com.ning.billing.util.callcontext.CallContext;
 import com.ning.billing.util.clock.Clock;
 
 public class DefaultEntitlementMigrationApi implements EntitlementMigrationApi {
@@ -59,10 +59,10 @@ public class DefaultEntitlementMigrationApi implements EntitlementMigrationApi {
     private final Clock clock;
 
     @Inject
-    public DefaultEntitlementMigrationApi(MigrationPlanAligner migrationAligner,
-            SubscriptionFactory factory,
-            EntitlementDao dao,
-            Clock clock) {
+    public DefaultEntitlementMigrationApi(final MigrationPlanAligner migrationAligner,
+                                          final SubscriptionFactory factory,
+                                          final EntitlementDao dao,
+                                          final Clock clock) {
         this.dao = dao;
         this.migrationAligner = migrationAligner;
         this.factory = factory;
@@ -70,32 +70,32 @@ public class DefaultEntitlementMigrationApi implements EntitlementMigrationApi {
     }
 
     @Override
-    public void migrate(EntitlementAccountMigration toBeMigrated, CallContext context)
-    throws EntitlementMigrationApiException {
-        AccountMigrationData accountMigrationData = createAccountMigrationData(toBeMigrated, context);
+    public void migrate(final EntitlementAccountMigration toBeMigrated, final CallContext context)
+            throws EntitlementMigrationApiException {
+        final AccountMigrationData accountMigrationData = createAccountMigrationData(toBeMigrated, context);
         dao.migrate(toBeMigrated.getAccountKey(), accountMigrationData, context);
     }
 
-    private AccountMigrationData createAccountMigrationData(EntitlementAccountMigration toBeMigrated, CallContext context)
-    throws EntitlementMigrationApiException  {
+    private AccountMigrationData createAccountMigrationData(final EntitlementAccountMigration toBeMigrated, final CallContext context)
+            throws EntitlementMigrationApiException {
 
         final UUID accountId = toBeMigrated.getAccountKey();
         final DateTime now = clock.getUTCNow();
 
-        List<BundleMigrationData> accountBundleData = new LinkedList<BundleMigrationData>();
+        final List<BundleMigrationData> accountBundleData = new LinkedList<BundleMigrationData>();
 
         for (final EntitlementBundleMigration curBundle : toBeMigrated.getBundles()) {
 
-            SubscriptionBundleData bundleData = new SubscriptionBundleData(curBundle.getBundleKey(), accountId, clock.getUTCNow());
-            List<SubscriptionMigrationData> bundleSubscriptionData = new LinkedList<AccountMigrationData.SubscriptionMigrationData>();
+            final SubscriptionBundleData bundleData = new SubscriptionBundleData(curBundle.getBundleKey(), accountId, clock.getUTCNow());
+            final List<SubscriptionMigrationData> bundleSubscriptionData = new LinkedList<AccountMigrationData.SubscriptionMigrationData>();
 
 
-            List<EntitlementSubscriptionMigration> sortedSubscriptions = Lists.newArrayList(curBundle.getSubscriptions());
+            final List<EntitlementSubscriptionMigration> sortedSubscriptions = Lists.newArrayList(curBundle.getSubscriptions());
             // Make sure we have first mpp or legacy, then addon and for each category order by CED
             Collections.sort(sortedSubscriptions, new Comparator<EntitlementSubscriptionMigration>() {
                 @Override
-                public int compare(EntitlementSubscriptionMigration o1,
-                        EntitlementSubscriptionMigration o2) {
+                public int compare(final EntitlementSubscriptionMigration o1,
+                                   final EntitlementSubscriptionMigration o2) {
                     if (o1.getCategory().equals(o2.getCategory())) {
                         return o1.getSubscriptionCases()[0].getEffectiveDate().compareTo(o2.getSubscriptionCases()[0].getEffectiveDate());
                     } else {
@@ -115,98 +115,98 @@ public class DefaultEntitlementMigrationApi implements EntitlementMigrationApi {
             });
 
             DateTime bundleStartDate = null;
-            for (EntitlementSubscriptionMigration curSub : sortedSubscriptions) {
+            for (final EntitlementSubscriptionMigration curSub : sortedSubscriptions) {
                 SubscriptionMigrationData data = null;
                 if (bundleStartDate == null) {
                     data = createInitialSubscription(bundleData.getId(), curSub.getCategory(), curSub.getSubscriptionCases(), now, curSub.getChargedThroughDate(), context);
                     bundleStartDate = data.getInitialEvents().get(0).getEffectiveDate();
                 } else {
                     data = createSubscriptionMigrationDataWithBundleDate(bundleData.getId(), curSub.getCategory(), curSub.getSubscriptionCases(), now,
-                    		bundleStartDate, curSub.getChargedThroughDate(), context);
+                                                                         bundleStartDate, curSub.getChargedThroughDate(), context);
                 }
                 if (data != null) {
                     bundleSubscriptionData.add(data);
                 }
             }
-            BundleMigrationData bundleMigrationData = new BundleMigrationData(bundleData, bundleSubscriptionData);
+            final BundleMigrationData bundleMigrationData = new BundleMigrationData(bundleData, bundleSubscriptionData);
             accountBundleData.add(bundleMigrationData);
         }
-        AccountMigrationData accountMigrationData = new AccountMigrationData(accountBundleData);
+        final AccountMigrationData accountMigrationData = new AccountMigrationData(accountBundleData);
         return accountMigrationData;
     }
 
-    private SubscriptionMigrationData createInitialSubscription(UUID bundleId, ProductCategory productCategory,
-            EntitlementSubscriptionMigrationCase [] input, DateTime now, DateTime ctd, CallContext context)
-        throws EntitlementMigrationApiException {
-
-        TimedMigration [] events = migrationAligner.getEventsMigration(input, now);
-        DateTime migrationStartDate= events[0].getEventTime();
-        List<EntitlementEvent> emptyEvents =  Collections.emptyList();
-        SubscriptionData subscriptionData = factory.createSubscription(new SubscriptionBuilder()
-            .setId(UUID.randomUUID())
-            .setBundleId(bundleId)
-            .setCategory(productCategory)
-            .setBundleStartDate(migrationStartDate)
-            .setStartDate(migrationStartDate),
-            emptyEvents);
+    private SubscriptionMigrationData createInitialSubscription(final UUID bundleId, final ProductCategory productCategory,
+                                                                final EntitlementSubscriptionMigrationCase[] input, final DateTime now, final DateTime ctd, final CallContext context)
+            throws EntitlementMigrationApiException {
+
+        final TimedMigration[] events = migrationAligner.getEventsMigration(input, now);
+        final DateTime migrationStartDate = events[0].getEventTime();
+        final List<EntitlementEvent> emptyEvents = Collections.emptyList();
+        final SubscriptionData subscriptionData = factory.createSubscription(new SubscriptionBuilder()
+                                                                               .setId(UUID.randomUUID())
+                                                                               .setBundleId(bundleId)
+                                                                               .setCategory(productCategory)
+                                                                               .setBundleStartDate(migrationStartDate)
+                                                                               .setStartDate(migrationStartDate),
+                                                                       emptyEvents);
         return new SubscriptionMigrationData(subscriptionData, toEvents(subscriptionData, now, ctd, events, context));
     }
 
-    private SubscriptionMigrationData createSubscriptionMigrationDataWithBundleDate(UUID bundleId, ProductCategory productCategory,
-            EntitlementSubscriptionMigrationCase [] input, DateTime now, DateTime bundleStartDate, DateTime ctd, CallContext context)
-    throws EntitlementMigrationApiException {
-        TimedMigration [] events = migrationAligner.getEventsMigration(input, now);
-        DateTime migrationStartDate= events[0].getEventTime();
-        List<EntitlementEvent> emptyEvents =  Collections.emptyList();
-        SubscriptionData subscriptionData = factory.createSubscription(new SubscriptionBuilder()
-            .setId(UUID.randomUUID())
-            .setBundleId(bundleId)
-            .setCategory(productCategory)
-            .setBundleStartDate(bundleStartDate)
-            .setStartDate(migrationStartDate),
-            emptyEvents);
+    private SubscriptionMigrationData createSubscriptionMigrationDataWithBundleDate(final UUID bundleId, final ProductCategory productCategory,
+                                                                                    final EntitlementSubscriptionMigrationCase[] input, final DateTime now, final DateTime bundleStartDate, final DateTime ctd, final CallContext context)
+            throws EntitlementMigrationApiException {
+        final TimedMigration[] events = migrationAligner.getEventsMigration(input, now);
+        final DateTime migrationStartDate = events[0].getEventTime();
+        final List<EntitlementEvent> emptyEvents = Collections.emptyList();
+        final SubscriptionData subscriptionData = factory.createSubscription(new SubscriptionBuilder()
+                                                                               .setId(UUID.randomUUID())
+                                                                               .setBundleId(bundleId)
+                                                                               .setCategory(productCategory)
+                                                                               .setBundleStartDate(bundleStartDate)
+                                                                               .setStartDate(migrationStartDate),
+                                                                       emptyEvents);
         return new SubscriptionMigrationData(subscriptionData, toEvents(subscriptionData, now, ctd, events, context));
     }
 
-    private List<EntitlementEvent> toEvents(SubscriptionData subscriptionData, DateTime now, DateTime ctd, TimedMigration [] migrationEvents, CallContext context) {
+    private List<EntitlementEvent> toEvents(final SubscriptionData subscriptionData, final DateTime now, final DateTime ctd, final TimedMigration[] migrationEvents, final CallContext context) {
 
 
         ApiEventMigrateEntitlement creationEvent = null;
-        List<EntitlementEvent> events = new ArrayList<EntitlementEvent>(migrationEvents.length);
-        for (TimedMigration cur : migrationEvents) {
+        final List<EntitlementEvent> events = new ArrayList<EntitlementEvent>(migrationEvents.length);
+        for (final TimedMigration cur : migrationEvents) {
 
             if (cur.getEventType() == EventType.PHASE) {
-                PhaseEvent nextPhaseEvent = PhaseEventData.createNextPhaseEvent(cur.getPhase().getName(), subscriptionData, now, cur.getEventTime());
+                final PhaseEvent nextPhaseEvent = PhaseEventData.createNextPhaseEvent(cur.getPhase().getName(), subscriptionData, now, cur.getEventTime());
                 events.add(nextPhaseEvent);
 
             } else if (cur.getEventType() == EventType.API_USER) {
 
-                ApiEventBuilder builder = new ApiEventBuilder()
-                .setSubscriptionId(subscriptionData.getId())
-                .setEventPlan((cur.getPlan() != null) ? cur.getPlan().getName() : null)
-                .setEventPlanPhase((cur.getPhase() != null) ? cur.getPhase().getName() : null)
-                .setEventPriceList(cur.getPriceList())
-                .setActiveVersion(subscriptionData.getActiveVersion())
-                .setEffectiveDate(cur.getEventTime())
-                .setProcessedDate(now)
-                .setRequestedDate(now)
-                .setUserToken(context.getUserToken())
-                .setFromDisk(true);
-
-                switch(cur.getApiEventType()) {
-                case MIGRATE_ENTITLEMENT:
-                    creationEvent = new ApiEventMigrateEntitlement(builder);
-                    events.add(creationEvent);
-                    break;
-
-                case CHANGE:
-                    events.add(new ApiEventChange(builder));
-                    break;
-                case CANCEL:
-                    events.add(new ApiEventCancel(builder));
-                    break;
-                default:
-                    throw new EntitlementError(String.format("Unexpected type of api migration event %s", cur.getApiEventType()));
+                final ApiEventBuilder builder = new ApiEventBuilder()
+                        .setSubscriptionId(subscriptionData.getId())
+                        .setEventPlan((cur.getPlan() != null) ? cur.getPlan().getName() : null)
+                        .setEventPlanPhase((cur.getPhase() != null) ? cur.getPhase().getName() : null)
+                        .setEventPriceList(cur.getPriceList())
+                        .setActiveVersion(subscriptionData.getActiveVersion())
+                        .setEffectiveDate(cur.getEventTime())
+                        .setProcessedDate(now)
+                        .setRequestedDate(now)
+                        .setUserToken(context.getUserToken())
+                        .setFromDisk(true);
+
+                switch (cur.getApiEventType()) {
+                    case MIGRATE_ENTITLEMENT:
+                        creationEvent = new ApiEventMigrateEntitlement(builder);
+                        events.add(creationEvent);
+                        break;
+
+                    case CHANGE:
+                        events.add(new ApiEventChange(builder));
+                        break;
+                    case CANCEL:
+                        events.add(new ApiEventCancel(builder));
+                        break;
+                    default:
+                        throw new EntitlementError(String.format("Unexpected type of api migration event %s", cur.getApiEventType()));
                 }
             } else {
                 throw new EntitlementError(String.format("Unexpected type of migration event %s", cur.getEventType()));
@@ -218,7 +218,7 @@ public class DefaultEntitlementMigrationApi implements EntitlementMigrationApi {
         events.add(new ApiEventMigrateBilling(creationEvent, ctd));
         Collections.sort(events, new Comparator<EntitlementEvent>() {
 
-            int compForApiType(EntitlementEvent o1, EntitlementEvent o2, ApiEventType type) {
+            int compForApiType(final EntitlementEvent o1, final EntitlementEvent o2, final ApiEventType type) {
 
                 ApiEventType apiO1 = null;
                 if (o1.getType() == EventType.API_USER) {
@@ -238,7 +238,7 @@ public class DefaultEntitlementMigrationApi implements EntitlementMigrationApi {
             }
 
             @Override
-            public int compare(EntitlementEvent o1, EntitlementEvent o2) {
+            public int compare(final EntitlementEvent o1, final EntitlementEvent o2) {
 
                 int comp = o1.getEffectiveDate().compareTo(o2.getEffectiveDate());
                 if (comp == 0) {

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/SubscriptionApiService.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/SubscriptionApiService.java
index b5a3a1e..8d216a2 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/SubscriptionApiService.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/SubscriptionApiService.java
@@ -15,37 +15,34 @@
  */
 package com.ning.billing.entitlement.api;
 
-import java.util.List;
-
 import org.joda.time.DateTime;
 
 import com.ning.billing.catalog.api.BillingPeriod;
 import com.ning.billing.catalog.api.PhaseType;
 import com.ning.billing.catalog.api.Plan;
 import com.ning.billing.catalog.api.PlanPhaseSpecifier;
+import com.ning.billing.entitlement.api.user.DefaultSubscriptionFactory.SubscriptionBuilder;
 import com.ning.billing.entitlement.api.user.EntitlementUserApiException;
 import com.ning.billing.entitlement.api.user.SubscriptionData;
-import com.ning.billing.entitlement.api.user.SubscriptionStatusDryRun;
-import com.ning.billing.entitlement.api.user.DefaultSubscriptionFactory.SubscriptionBuilder;
 import com.ning.billing.util.callcontext.CallContext;
 
 public interface SubscriptionApiService {
 
     public SubscriptionData createPlan(SubscriptionBuilder builder, Plan plan, PhaseType initialPhase,
-            String realPriceList, DateTime requestedDate, DateTime effectiveDate, DateTime processedDate,
-            CallContext context)
-        throws EntitlementUserApiException;
+                                       String realPriceList, DateTime requestedDate, DateTime effectiveDate, DateTime processedDate,
+                                       CallContext context)
+            throws EntitlementUserApiException;
 
     public boolean recreatePlan(SubscriptionData subscription, PlanPhaseSpecifier spec, DateTime requestedDate, CallContext context)
-        throws EntitlementUserApiException;
+            throws EntitlementUserApiException;
 
     public boolean cancel(SubscriptionData subscription, DateTime requestedDate, boolean eot, CallContext context)
-        throws EntitlementUserApiException;
+            throws EntitlementUserApiException;
 
     public boolean uncancel(SubscriptionData subscription, CallContext context)
-        throws EntitlementUserApiException;
+            throws EntitlementUserApiException;
 
     public boolean changePlan(SubscriptionData subscription, String productName, BillingPeriod term,
-            String priceList, DateTime requestedDate, CallContext context)
-        throws EntitlementUserApiException;
+                              String priceList, DateTime requestedDate, CallContext context)
+            throws EntitlementUserApiException;
 }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/SubscriptionFactory.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/SubscriptionFactory.java
index 2b12487..c0ccc17 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/SubscriptionFactory.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/SubscriptionFactory.java
@@ -17,11 +17,11 @@ package com.ning.billing.entitlement.api;
 
 import java.util.List;
 
-import com.ning.billing.entitlement.api.user.SubscriptionData;
 import com.ning.billing.entitlement.api.user.DefaultSubscriptionFactory.SubscriptionBuilder;
+import com.ning.billing.entitlement.api.user.SubscriptionData;
 import com.ning.billing.entitlement.events.EntitlementEvent;
 
 public interface SubscriptionFactory {
-    
+
     public SubscriptionData createSubscription(SubscriptionBuilder builder, List<EntitlementEvent> events);
 }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/DefaultDeletedEvent.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/DefaultDeletedEvent.java
index 14b1e9e..fcfc82d 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/DefaultDeletedEvent.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/DefaultDeletedEvent.java
@@ -25,17 +25,17 @@ public class DefaultDeletedEvent implements DeletedEvent {
 
     private final UUID id;
     private final DateTime effectiveDate;
-    
-    public DefaultDeletedEvent(UUID id, DateTime effectiveDate) {
+
+    public DefaultDeletedEvent(final UUID id, final DateTime effectiveDate) {
         this.id = id;
         this.effectiveDate = effectiveDate;
     }
-    
+
     @Override
     public UUID getEventId() {
         return id;
     }
-    
+
     public DateTime getEffectiveDate() {
         return effectiveDate;
     }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/DefaultEntitlementTimelineApi.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/DefaultEntitlementTimelineApi.java
index 9f73725..3162a75 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/DefaultEntitlementTimelineApi.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/DefaultEntitlementTimelineApi.java
@@ -36,11 +36,11 @@ import com.ning.billing.catalog.api.ProductCategory;
 import com.ning.billing.entitlement.api.SubscriptionFactory;
 import com.ning.billing.entitlement.api.SubscriptionTransitionType;
 import com.ning.billing.entitlement.api.timeline.SubscriptionTimeline.NewEvent;
+import com.ning.billing.entitlement.api.user.DefaultSubscriptionFactory.SubscriptionBuilder;
 import com.ning.billing.entitlement.api.user.Subscription;
 import com.ning.billing.entitlement.api.user.SubscriptionBundle;
 import com.ning.billing.entitlement.api.user.SubscriptionBundleData;
 import com.ning.billing.entitlement.api.user.SubscriptionData;
-import com.ning.billing.entitlement.api.user.DefaultSubscriptionFactory.SubscriptionBuilder;
 import com.ning.billing.entitlement.api.user.SubscriptionTransitionData;
 import com.ning.billing.entitlement.engine.dao.EntitlementDao;
 import com.ning.billing.entitlement.events.EntitlementEvent;
@@ -55,7 +55,7 @@ public class DefaultEntitlementTimelineApi implements EntitlementTimelineApi {
     private final CatalogService catalogService;
 
 
-    private enum RepairType  {
+    private enum RepairType {
         BASE_REPAIR,
         ADD_ON_REPAIR,
         STANDALONE_REPAIR
@@ -64,7 +64,7 @@ public class DefaultEntitlementTimelineApi implements EntitlementTimelineApi {
 
     @Inject
     public DefaultEntitlementTimelineApi(@Named(DefaultEntitlementModule.REPAIR_NAMED) final SubscriptionFactory factory, final CatalogService catalogService,
-            @Named(DefaultEntitlementModule.REPAIR_NAMED) final RepairEntitlementLifecycleDao repairDao, final EntitlementDao dao) {
+                                         @Named(DefaultEntitlementModule.REPAIR_NAMED) final RepairEntitlementLifecycleDao repairDao, final EntitlementDao dao) {
         this.catalogService = catalogService;
         this.dao = dao;
         this.repairDao = repairDao;
@@ -73,11 +73,11 @@ public class DefaultEntitlementTimelineApi implements EntitlementTimelineApi {
 
 
     @Override
-    public BundleTimeline getBundleRepair(final UUID bundleId) 
-    throws EntitlementRepairException {
+    public BundleTimeline getBundleRepair(final UUID bundleId)
+            throws EntitlementRepairException {
 
         try {
-            SubscriptionBundle bundle = dao.getSubscriptionBundleFromId(bundleId);
+            final SubscriptionBundle bundle = dao.getSubscriptionBundleFromId(bundleId);
             if (bundle == null) {
                 throw new EntitlementRepairException(ErrorCode.ENT_REPAIR_UNKNOWN_BUNDLE, bundleId);
             }
@@ -86,7 +86,7 @@ public class DefaultEntitlementTimelineApi implements EntitlementTimelineApi {
                 throw new EntitlementRepairException(ErrorCode.ENT_REPAIR_NO_ACTIVE_SUBSCRIPTIONS, bundleId);
             }
             final String viewId = getViewId(((SubscriptionBundleData) bundle).getLastSysUpdateTime(), subscriptions);
-            final List<SubscriptionTimeline> repairs = createGetSubscriptionRepairList(subscriptions, Collections.<SubscriptionTimeline>emptyList()); 
+            final List<SubscriptionTimeline> repairs = createGetSubscriptionRepairList(subscriptions, Collections.<SubscriptionTimeline>emptyList());
             return createGetBundleRepair(bundleId, bundle.getKey(), viewId, repairs);
         } catch (CatalogApiException e) {
             throw new EntitlementRepairException(e);
@@ -94,18 +94,17 @@ public class DefaultEntitlementTimelineApi implements EntitlementTimelineApi {
     }
 
 
-
     @Override
     public BundleTimeline repairBundle(final BundleTimeline input, final boolean dryRun, final CallContext context)
-    throws EntitlementRepairException {
+            throws EntitlementRepairException {
 
         try {
 
-            SubscriptionBundle bundle = dao.getSubscriptionBundleFromId(input.getBundleId());
+            final SubscriptionBundle bundle = dao.getSubscriptionBundleFromId(input.getBundleId());
             if (bundle == null) {
                 throw new EntitlementRepairException(ErrorCode.ENT_REPAIR_UNKNOWN_BUNDLE, input.getBundleId());
             }
-            
+
 
             // Subscriptions are ordered with BASE subscription first-- if exists
             final List<Subscription> subscriptions = dao.getSubscriptions(factory, input.getBundleId());
@@ -115,7 +114,7 @@ public class DefaultEntitlementTimelineApi implements EntitlementTimelineApi {
 
             final String viewId = getViewId(((SubscriptionBundleData) bundle).getLastSysUpdateTime(), subscriptions);
             if (!viewId.equals(input.getViewId())) {
-                throw new EntitlementRepairException(ErrorCode.ENT_REPAIR_VIEW_CHANGED,input.getBundleId(), input.getViewId(), viewId);
+                throw new EntitlementRepairException(ErrorCode.ENT_REPAIR_VIEW_CHANGED, input.getBundleId(), input.getViewId(), viewId);
             }
 
             DateTime firstDeletedBPEventTime = null;
@@ -125,19 +124,19 @@ public class DefaultEntitlementTimelineApi implements EntitlementTimelineApi {
             DateTime newBundleStartDate = null;
 
             SubscriptionDataRepair baseSubscriptionRepair = null;
-            List<SubscriptionDataRepair> addOnSubscriptionInRepair = new LinkedList<SubscriptionDataRepair>();
-            List<SubscriptionDataRepair> inRepair =  new LinkedList<SubscriptionDataRepair>();
-            for (Subscription cur : subscriptions) {
+            final List<SubscriptionDataRepair> addOnSubscriptionInRepair = new LinkedList<SubscriptionDataRepair>();
+            final List<SubscriptionDataRepair> inRepair = new LinkedList<SubscriptionDataRepair>();
+            for (final Subscription cur : subscriptions) {
 
                 //
-                SubscriptionTimeline curRepair = findAndCreateSubscriptionRepair(cur.getId(), input.getSubscriptions());
+                final SubscriptionTimeline curRepair = findAndCreateSubscriptionRepair(cur.getId(), input.getSubscriptions());
                 if (curRepair != null) {
-                    SubscriptionDataRepair curInputRepair = ((SubscriptionDataRepair) cur);
+                    final SubscriptionDataRepair curInputRepair = ((SubscriptionDataRepair) cur);
                     final List<EntitlementEvent> remaining = getRemainingEventsAndValidateDeletedEvents(curInputRepair, firstDeletedBPEventTime, curRepair.getDeletedEvents());
 
-                    final boolean isPlanRecreate = (curRepair.getNewEvents().size() > 0 
-                            && (curRepair.getNewEvents().get(0).getSubscriptionTransitionType() == SubscriptionTransitionType.CREATE 
-                                    || curRepair.getNewEvents().get(0).getSubscriptionTransitionType() == SubscriptionTransitionType.RE_CREATE));
+                    final boolean isPlanRecreate = (curRepair.getNewEvents().size() > 0
+                            && (curRepair.getNewEvents().get(0).getSubscriptionTransitionType() == SubscriptionTransitionType.CREATE
+                            || curRepair.getNewEvents().get(0).getSubscriptionTransitionType() == SubscriptionTransitionType.RE_CREATE));
 
                     final DateTime newSubscriptionStartDate = isPlanRecreate ? curRepair.getNewEvents().get(0).getRequestedDate() : null;
 
@@ -151,27 +150,27 @@ public class DefaultEntitlementTimelineApi implements EntitlementTimelineApi {
 
                     if (cur.getCategory() == ProductCategory.BASE) {
 
-                        int bpTransitionSize =((SubscriptionData) cur).getAllTransitions().size();
+                        final int bpTransitionSize = ((SubscriptionData) cur).getAllTransitions().size();
                         lastRemainingBPEventTime = (remaining.size() > 0) ? curInputRepair.getAllTransitions().get(remaining.size() - 1).getEffectiveTransitionTime() : null;
-                        firstDeletedBPEventTime =  (remaining.size() < bpTransitionSize) ? curInputRepair.getAllTransitions().get(remaining.size()).getEffectiveTransitionTime() : null;
+                        firstDeletedBPEventTime = (remaining.size() < bpTransitionSize) ? curInputRepair.getAllTransitions().get(remaining.size()).getEffectiveTransitionTime() : null;
 
                         isBasePlanRecreate = isPlanRecreate;
                         newBundleStartDate = newSubscriptionStartDate;
                     }
 
                     if (curRepair.getNewEvents().size() > 0) {
-                        DateTime lastRemainingEventTime = (remaining.size() == 0) ? null : curInputRepair.getAllTransitions().get(remaining.size() - 1).getEffectiveTransitionTime();
+                        final DateTime lastRemainingEventTime = (remaining.size() == 0) ? null : curInputRepair.getAllTransitions().get(remaining.size() - 1).getEffectiveTransitionTime();
                         validateFirstNewEvent(curInputRepair, curRepair.getNewEvents().get(0), lastRemainingBPEventTime, lastRemainingEventTime);
                     }
 
 
-                    SubscriptionDataRepair curOutputRepair = createSubscriptionDataRepair(curInputRepair, newBundleStartDate, newSubscriptionStartDate, remaining);
+                    final SubscriptionDataRepair curOutputRepair = createSubscriptionDataRepair(curInputRepair, newBundleStartDate, newSubscriptionStartDate, remaining);
                     repairDao.initializeRepair(curInputRepair.getId(), remaining);
                     inRepair.add(curOutputRepair);
                     if (curOutputRepair.getCategory() == ProductCategory.ADD_ON) {
                         // Check if ADD_ON RE_CREATE is before BP start
                         if (isPlanRecreate && subscriptions.get(0).getStartDate().isAfter(curRepair.getNewEvents().get(0).getRequestedDate())) {
-                            throw new EntitlementRepairException(ErrorCode.ENT_REPAIR_AO_CREATE_BEFORE_BP_START, cur.getId(), cur.getBundleId());                            
+                            throw new EntitlementRepairException(ErrorCode.ENT_REPAIR_AO_CREATE_BEFORE_BP_START, cur.getId(), cur.getBundleId());
                         }
                         addOnSubscriptionInRepair.add(curOutputRepair);
                     } else if (curOutputRepair.getCategory() == ProductCategory.BASE) {
@@ -181,27 +180,27 @@ public class DefaultEntitlementTimelineApi implements EntitlementTimelineApi {
             }
 
             final RepairType repairType = getRepairType(subscriptions.get(0), (baseSubscriptionRepair != null));
-            switch(repairType) {
-            case BASE_REPAIR:
-                // We need to add any existing addon that are not in the input repair list
-                for (Subscription cur : subscriptions) {
-                    if (cur.getCategory() == ProductCategory.ADD_ON && !inRepair.contains(cur)) {
-                        SubscriptionDataRepair curOutputRepair = createSubscriptionDataRepair((SubscriptionDataRepair) cur, newBundleStartDate, null, ((SubscriptionDataRepair) cur).getEvents());
-                        repairDao.initializeRepair(curOutputRepair.getId(), ((SubscriptionDataRepair) cur).getEvents());
-                        inRepair.add(curOutputRepair);
-                        addOnSubscriptionInRepair.add(curOutputRepair);
+            switch (repairType) {
+                case BASE_REPAIR:
+                    // We need to add any existing addon that are not in the input repair list
+                    for (final Subscription cur : subscriptions) {
+                        if (cur.getCategory() == ProductCategory.ADD_ON && !inRepair.contains(cur)) {
+                            final SubscriptionDataRepair curOutputRepair = createSubscriptionDataRepair((SubscriptionDataRepair) cur, newBundleStartDate, null, ((SubscriptionDataRepair) cur).getEvents());
+                            repairDao.initializeRepair(curOutputRepair.getId(), ((SubscriptionDataRepair) cur).getEvents());
+                            inRepair.add(curOutputRepair);
+                            addOnSubscriptionInRepair.add(curOutputRepair);
+                        }
                     }
-                }
 
-                break;
-            case ADD_ON_REPAIR:
-                // We need to set the baseSubscription as it is useful to calculate addon validity
-                SubscriptionDataRepair baseSubscription =  (SubscriptionDataRepair) subscriptions.get(0);
-                baseSubscriptionRepair = createSubscriptionDataRepair(baseSubscription, baseSubscription.getBundleStartDate(), baseSubscription.getStartDate(), baseSubscription.getEvents());
-                break;
-            case STANDALONE_REPAIR:
-            default:
-                break;
+                    break;
+                case ADD_ON_REPAIR:
+                    // We need to set the baseSubscription as it is useful to calculate addon validity
+                    final SubscriptionDataRepair baseSubscription = (SubscriptionDataRepair) subscriptions.get(0);
+                    baseSubscriptionRepair = createSubscriptionDataRepair(baseSubscription, baseSubscription.getBundleStartDate(), baseSubscription.getStartDate(), baseSubscription.getEvents());
+                    break;
+                case STANDALONE_REPAIR:
+                default:
+                    break;
 
             }
 
@@ -209,22 +208,22 @@ public class DefaultEntitlementTimelineApi implements EntitlementTimelineApi {
             validateInputSubscriptionsKnown(subscriptions, input.getSubscriptions());
 
 
-            Collection<NewEvent> newEvents = createOrderedNewEventInput(input.getSubscriptions());
-            Iterator<NewEvent> it = newEvents.iterator();
+            final Collection<NewEvent> newEvents = createOrderedNewEventInput(input.getSubscriptions());
+            final Iterator<NewEvent> it = newEvents.iterator();
             while (it.hasNext()) {
-                DefaultNewEvent cur = (DefaultNewEvent) it.next();
-                SubscriptionDataRepair curDataRepair = findSubscriptionDataRepair(cur.getSubscriptionId(), inRepair);
+                final DefaultNewEvent cur = (DefaultNewEvent) it.next();
+                final SubscriptionDataRepair curDataRepair = findSubscriptionDataRepair(cur.getSubscriptionId(), inRepair);
                 if (curDataRepair == null) {
                     throw new EntitlementRepairException(ErrorCode.ENT_REPAIR_UNKNOWN_SUBSCRIPTION, cur.getSubscriptionId());
                 }
                 curDataRepair.addNewRepairEvent(cur, baseSubscriptionRepair, addOnSubscriptionInRepair, context);
             }
-            
+
             if (dryRun) {
-                
+
                 baseSubscriptionRepair.addFutureAddonCancellation(addOnSubscriptionInRepair, context);
 
-                final List<SubscriptionTimeline> repairs = createGetSubscriptionRepairList(subscriptions, convertDataRepair(inRepair)); 
+                final List<SubscriptionTimeline> repairs = createGetSubscriptionRepairList(subscriptions, convertDataRepair(inRepair));
                 return createGetBundleRepair(input.getBundleId(), bundle.getKey(), input.getViewId(), repairs);
             } else {
                 dao.repair(bundle.getAccountId(), input.getBundleId(), inRepair, context);
@@ -237,9 +236,7 @@ public class DefaultEntitlementTimelineApi implements EntitlementTimelineApi {
         }
     }
 
- 
-    
-    
+
     private RepairType getRepairType(final Subscription firstSubscription, final boolean gotBaseSubscription) {
         if (firstSubscription.getCategory() == ProductCategory.BASE) {
             return gotBaseSubscription ? RepairType.BASE_REPAIR : RepairType.ADD_ON_REPAIR;
@@ -248,8 +245,8 @@ public class DefaultEntitlementTimelineApi implements EntitlementTimelineApi {
         }
     }
 
-    private void validateBasePlanRecreate(boolean isBasePlanRecreate, List<Subscription> subscriptions, List<SubscriptionTimeline> input) 
-    throws EntitlementRepairException  {
+    private void validateBasePlanRecreate(final boolean isBasePlanRecreate, final List<Subscription> subscriptions, final List<SubscriptionTimeline> input)
+            throws EntitlementRepairException {
 
         if (!isBasePlanRecreate) {
             return;
@@ -257,22 +254,22 @@ public class DefaultEntitlementTimelineApi implements EntitlementTimelineApi {
         if (subscriptions.size() != input.size()) {
             throw new EntitlementRepairException(ErrorCode.ENT_REPAIR_BP_RECREATE_MISSING_AO, subscriptions.get(0).getBundleId());
         }
-        for (SubscriptionTimeline cur : input) {
-            if (cur.getNewEvents().size() != 0 
+        for (final SubscriptionTimeline cur : input) {
+            if (cur.getNewEvents().size() != 0
                     && (cur.getNewEvents().get(0).getSubscriptionTransitionType() != SubscriptionTransitionType.CREATE
-                            && cur.getNewEvents().get(0).getSubscriptionTransitionType() != SubscriptionTransitionType.RE_CREATE)) {
+                    && cur.getNewEvents().get(0).getSubscriptionTransitionType() != SubscriptionTransitionType.RE_CREATE)) {
                 throw new EntitlementRepairException(ErrorCode.ENT_REPAIR_BP_RECREATE_MISSING_AO_CREATE, subscriptions.get(0).getBundleId());
             }
         }
     }
 
 
-    private void validateInputSubscriptionsKnown(List<Subscription> subscriptions, List<SubscriptionTimeline> input)
-    throws EntitlementRepairException {
+    private void validateInputSubscriptionsKnown(final List<Subscription> subscriptions, final List<SubscriptionTimeline> input)
+            throws EntitlementRepairException {
 
-        for (SubscriptionTimeline cur : input) {
+        for (final SubscriptionTimeline cur : input) {
             boolean found = false;
-            for (Subscription s : subscriptions) {
+            for (final Subscription s : subscriptions) {
                 if (s.getId().equals(cur.getId())) {
                     found = true;
                     break;
@@ -284,8 +281,8 @@ public class DefaultEntitlementTimelineApi implements EntitlementTimelineApi {
         }
     }
 
-    private void validateFirstNewEvent(final SubscriptionData data, final NewEvent firstNewEvent, final DateTime lastBPRemainingTime, final DateTime lastRemainingTime) 
-    throws EntitlementRepairException {
+    private void validateFirstNewEvent(final SubscriptionData data, final NewEvent firstNewEvent, final DateTime lastBPRemainingTime, final DateTime lastRemainingTime)
+            throws EntitlementRepairException {
         if (lastBPRemainingTime != null &&
                 firstNewEvent.getRequestedDate().isBefore(lastBPRemainingTime)) {
             throw new EntitlementRepairException(ErrorCode.ENT_REPAIR_NEW_EVENT_BEFORE_LAST_BP_REMAINING, firstNewEvent.getSubscriptionTransitionType(), data.getId());
@@ -297,16 +294,16 @@ public class DefaultEntitlementTimelineApi implements EntitlementTimelineApi {
 
     }
 
-    private Collection<NewEvent> createOrderedNewEventInput(List<SubscriptionTimeline> subscriptionsReapir) {
-        TreeSet<NewEvent> newEventSet = new TreeSet<SubscriptionTimeline.NewEvent>(new Comparator<NewEvent>() {
+    private Collection<NewEvent> createOrderedNewEventInput(final List<SubscriptionTimeline> subscriptionsReapir) {
+        final TreeSet<NewEvent> newEventSet = new TreeSet<SubscriptionTimeline.NewEvent>(new Comparator<NewEvent>() {
             @Override
-            public int compare(NewEvent o1, NewEvent o2) {
+            public int compare(final NewEvent o1, final NewEvent o2) {
                 return o1.getRequestedDate().compareTo(o2.getRequestedDate());
             }
         });
-        for (SubscriptionTimeline cur : subscriptionsReapir) {
-            for (NewEvent e : cur.getNewEvents()) {
-                newEventSet.add(new DefaultNewEvent(cur.getId(), e.getPlanPhaseSpecifier(), e.getRequestedDate(), e.getSubscriptionTransitionType()));    
+        for (final SubscriptionTimeline cur : subscriptionsReapir) {
+            for (final NewEvent e : cur.getNewEvents()) {
+                newEventSet.add(new DefaultNewEvent(cur.getId(), e.getPlanPhaseSpecifier(), e.getRequestedDate(), e.getSubscriptionTransitionType()));
             }
         }
         return newEventSet;
@@ -314,19 +311,19 @@ public class DefaultEntitlementTimelineApi implements EntitlementTimelineApi {
 
 
     private List<EntitlementEvent> getRemainingEventsAndValidateDeletedEvents(final SubscriptionDataRepair data, final DateTime firstBPDeletedTime,
-            final List<SubscriptionTimeline.DeletedEvent> deletedEvents) 
-            throws EntitlementRepairException  {
+                                                                              final List<SubscriptionTimeline.DeletedEvent> deletedEvents)
+            throws EntitlementRepairException {
 
         if (deletedEvents == null || deletedEvents.size() == 0) {
             return data.getEvents();
         }
 
         int nbDeleted = 0;
-        LinkedList<EntitlementEvent> result = new LinkedList<EntitlementEvent>();
-        for (EntitlementEvent cur : data.getEvents()) {
+        final LinkedList<EntitlementEvent> result = new LinkedList<EntitlementEvent>();
+        for (final EntitlementEvent cur : data.getEvents()) {
 
             boolean foundDeletedEvent = false;
-            for (SubscriptionTimeline.DeletedEvent d : deletedEvents) {
+            for (final SubscriptionTimeline.DeletedEvent d : deletedEvents) {
                 if (cur.getId().equals(d.getEventId())) {
                     foundDeletedEvent = true;
                     nbDeleted++;
@@ -336,9 +333,9 @@ public class DefaultEntitlementTimelineApi implements EntitlementTimelineApi {
             if (!foundDeletedEvent && nbDeleted > 0) {
                 throw new EntitlementRepairException(ErrorCode.ENT_REPAIR_INVALID_DELETE_SET, cur.getId(), data.getId());
             }
-            if (firstBPDeletedTime != null && 
-                    ! cur.getEffectiveDate().isBefore(firstBPDeletedTime) &&
-                    ! foundDeletedEvent) {
+            if (firstBPDeletedTime != null &&
+                    !cur.getEffectiveDate().isBefore(firstBPDeletedTime) &&
+                    !foundDeletedEvent) {
                 throw new EntitlementRepairException(ErrorCode.ENT_REPAIR_MISSING_AO_DELETE_EVENT, cur.getId(), data.getId());
             }
 
@@ -347,9 +344,9 @@ public class DefaultEntitlementTimelineApi implements EntitlementTimelineApi {
             }
         }
         if (nbDeleted != deletedEvents.size()) {
-            for (SubscriptionTimeline.DeletedEvent d : deletedEvents) {
+            for (final SubscriptionTimeline.DeletedEvent d : deletedEvents) {
                 boolean found = false;
-                for (SubscriptionTransitionData cur : data.getAllTransitions()) {
+                for (final SubscriptionTransitionData cur : data.getAllTransitions()) {
                     if (cur.getId().equals(d.getEventId())) {
                         found = true;
                         continue;
@@ -365,10 +362,10 @@ public class DefaultEntitlementTimelineApi implements EntitlementTimelineApi {
     }
 
 
-    private String getViewId(DateTime lastUpdateBundleDate, List<Subscription> subscriptions) {
-        StringBuilder tmp = new StringBuilder();
+    private String getViewId(final DateTime lastUpdateBundleDate, final List<Subscription> subscriptions) {
+        final StringBuilder tmp = new StringBuilder();
         long lastOrderedId = -1;
-        for (Subscription cur : subscriptions) {
+        for (final Subscription cur : subscriptions) {
             lastOrderedId = lastOrderedId < ((SubscriptionData) cur).getLastEventOrderedId() ? ((SubscriptionData) cur).getLastEventOrderedId() : lastOrderedId;
         }
         tmp.append(lastOrderedId);
@@ -383,14 +380,17 @@ public class DefaultEntitlementTimelineApi implements EntitlementTimelineApi {
             public String getViewId() {
                 return viewId;
             }
+
             @Override
             public List<SubscriptionTimeline> getSubscriptions() {
                 return repairList;
             }
+
             @Override
             public UUID getBundleId() {
                 return bundleId;
             }
+
             @Override
             public String getExternalKey() {
                 return externalKey;
@@ -402,13 +402,13 @@ public class DefaultEntitlementTimelineApi implements EntitlementTimelineApi {
     private List<SubscriptionTimeline> createGetSubscriptionRepairList(final List<Subscription> subscriptions, final List<SubscriptionTimeline> inRepair) throws CatalogApiException {
 
         final List<SubscriptionTimeline> result = new LinkedList<SubscriptionTimeline>();
-        Set<UUID> repairIds = new TreeSet<UUID>();
+        final Set<UUID> repairIds = new TreeSet<UUID>();
         for (final SubscriptionTimeline cur : inRepair) {
             repairIds.add(cur.getId());
             result.add(cur);
         }
         for (final Subscription cur : subscriptions) {
-            if ( !repairIds.contains(cur.getId())) { 
+            if (!repairIds.contains(cur.getId())) {
                 result.add(new DefaultSubscriptionTimeline((SubscriptionDataRepair) cur, catalogService.getFullCatalog()));
             }
         }
@@ -416,16 +416,16 @@ public class DefaultEntitlementTimelineApi implements EntitlementTimelineApi {
     }
 
 
-    private List<SubscriptionTimeline> convertDataRepair(List<SubscriptionDataRepair> input) throws CatalogApiException  {
-        List<SubscriptionTimeline> result = new LinkedList<SubscriptionTimeline>();
-        for (SubscriptionDataRepair cur : input) {
+    private List<SubscriptionTimeline> convertDataRepair(final List<SubscriptionDataRepair> input) throws CatalogApiException {
+        final List<SubscriptionTimeline> result = new LinkedList<SubscriptionTimeline>();
+        for (final SubscriptionDataRepair cur : input) {
             result.add(new DefaultSubscriptionTimeline(cur, catalogService.getFullCatalog()));
         }
         return result;
     }
 
     private SubscriptionDataRepair findSubscriptionDataRepair(final UUID targetId, final List<SubscriptionDataRepair> input) {
-        for (SubscriptionDataRepair cur : input) {
+        for (final SubscriptionDataRepair cur : input) {
             if (cur.getId().equals(targetId)) {
                 return cur;
             }
@@ -435,7 +435,7 @@ public class DefaultEntitlementTimelineApi implements EntitlementTimelineApi {
 
 
     private SubscriptionDataRepair createSubscriptionDataRepair(final SubscriptionData curData, final DateTime newBundleStartDate, final DateTime newSubscriptionStartDate, final List<EntitlementEvent> initialEvents) {
-        SubscriptionBuilder builder = new SubscriptionBuilder(curData);
+        final SubscriptionBuilder builder = new SubscriptionBuilder(curData);
         builder.setActiveVersion(curData.getActiveVersion() + 1);
         if (newBundleStartDate != null) {
             builder.setBundleStartDate(newBundleStartDate);
@@ -444,17 +444,17 @@ public class DefaultEntitlementTimelineApi implements EntitlementTimelineApi {
             builder.setStartDate(newSubscriptionStartDate);
         }
         if (initialEvents.size() > 0) {
-            for (EntitlementEvent cur : initialEvents) {
+            for (final EntitlementEvent cur : initialEvents) {
                 cur.setActiveVersion(builder.getActiveVersion());
             }
         }
-        SubscriptionDataRepair result = (SubscriptionDataRepair) factory.createSubscription(builder, initialEvents);
+        final SubscriptionDataRepair result = (SubscriptionDataRepair) factory.createSubscription(builder, initialEvents);
         return result;
     }
 
 
     private SubscriptionTimeline findAndCreateSubscriptionRepair(final UUID target, final List<SubscriptionTimeline> input) {
-        for (SubscriptionTimeline cur : input) {
+        for (final SubscriptionTimeline cur : input) {
             if (target.equals(cur.getId())) {
                 return new DefaultSubscriptionTimeline(cur);
             }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/DefaultNewEvent.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/DefaultNewEvent.java
index 87ece9f..db374d8 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/DefaultNewEvent.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/DefaultNewEvent.java
@@ -29,14 +29,14 @@ public class DefaultNewEvent implements NewEvent {
     private final PlanPhaseSpecifier spec;
     private final DateTime requestedDate;
     private final SubscriptionTransitionType transitionType;
-    
+
     public DefaultNewEvent(final UUID subscriptionId, final PlanPhaseSpecifier spec, final DateTime requestedDate, final SubscriptionTransitionType transitionType) {
         this.subscriptionId = subscriptionId;
         this.spec = spec;
         this.requestedDate = requestedDate;
         this.transitionType = transitionType;
     }
-    
+
     @Override
     public PlanPhaseSpecifier getPlanPhaseSpecifier() {
         return spec;
@@ -51,7 +51,7 @@ public class DefaultNewEvent implements NewEvent {
     public SubscriptionTransitionType getSubscriptionTransitionType() {
         return transitionType;
     }
-    
+
     public UUID getSubscriptionId() {
         return subscriptionId;
     }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/DefaultRepairEntitlementEvent.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/DefaultRepairEntitlementEvent.java
index b1cc31c..6496488 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/DefaultRepairEntitlementEvent.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/DefaultRepairEntitlementEvent.java
@@ -17,10 +17,11 @@ package com.ning.billing.entitlement.api.timeline;
 
 import java.util.UUID;
 
+import org.joda.time.DateTime;
+
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.joda.time.DateTime;
 
 public class DefaultRepairEntitlementEvent implements RepairEntitlementEvent {
 
@@ -28,19 +29,19 @@ public class DefaultRepairEntitlementEvent implements RepairEntitlementEvent {
     private final UUID bundleId;
     private final UUID accountId;
     private final DateTime effectiveDate;
-    
-    
+
+
     @JsonCreator
     public DefaultRepairEntitlementEvent(@JsonProperty("userToken") final UUID userToken,
-            @JsonProperty("accountId") final UUID accountId,
-            @JsonProperty("bundleId") final UUID bundleId,
-            @JsonProperty("effectiveDate") final DateTime effectiveDate) {
+                                         @JsonProperty("accountId") final UUID accountId,
+                                         @JsonProperty("bundleId") final UUID bundleId,
+                                         @JsonProperty("effectiveDate") final DateTime effectiveDate) {
         this.userToken = userToken;
         this.bundleId = bundleId;
         this.accountId = accountId;
         this.effectiveDate = effectiveDate;
     }
-    
+
     @JsonIgnore
     @Override
     public BusEventType getBusEventType() {
@@ -83,34 +84,45 @@ public class DefaultRepairEntitlementEvent implements RepairEntitlementEvent {
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
+    public boolean equals(final Object obj) {
+        if (this == obj) {
             return true;
-        if (obj == null)
+        }
+        if (obj == null) {
             return false;
-        if (getClass() != obj.getClass())
+        }
+        if (getClass() != obj.getClass()) {
             return false;
-        DefaultRepairEntitlementEvent other = (DefaultRepairEntitlementEvent) obj;
+        }
+        final DefaultRepairEntitlementEvent other = (DefaultRepairEntitlementEvent) obj;
         if (accountId == null) {
-            if (other.accountId != null)
+            if (other.accountId != null) {
                 return false;
-        } else if (!accountId.equals(other.accountId))
+            }
+        } else if (!accountId.equals(other.accountId)) {
             return false;
+        }
         if (bundleId == null) {
-            if (other.bundleId != null)
+            if (other.bundleId != null) {
                 return false;
-        } else if (!bundleId.equals(other.bundleId))
+            }
+        } else if (!bundleId.equals(other.bundleId)) {
             return false;
+        }
         if (effectiveDate == null) {
-            if (other.effectiveDate != null)
+            if (other.effectiveDate != null) {
                 return false;
-        } else if (effectiveDate.compareTo(other.effectiveDate) != 0)
+            }
+        } else if (effectiveDate.compareTo(other.effectiveDate) != 0) {
             return false;
+        }
         if (userToken == null) {
-            if (other.userToken != null)
+            if (other.userToken != null) {
                 return false;
-        } else if (!userToken.equals(other.userToken))
+            }
+        } else if (!userToken.equals(other.userToken)) {
             return false;
+        }
         return true;
     }
 }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/DefaultSubscriptionTimeline.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/DefaultSubscriptionTimeline.java
index 4080326..f9a17f3 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/DefaultSubscriptionTimeline.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/DefaultSubscriptionTimeline.java
@@ -38,65 +38,154 @@ import com.ning.billing.entitlement.events.phase.PhaseEvent;
 import com.ning.billing.entitlement.events.user.ApiEvent;
 import com.ning.billing.entitlement.events.user.ApiEventType;
 
-public class DefaultSubscriptionTimeline implements SubscriptionTimeline  {
+public class DefaultSubscriptionTimeline implements SubscriptionTimeline {
 
     private final UUID id;
     private final List<ExistingEvent> existingEvents;
     private final List<NewEvent> newEvents;
-    private final List<DeletedEvent> deletedEvents;    
-    
+    private final List<DeletedEvent> deletedEvents;
+
     public DefaultSubscriptionTimeline(final UUID id) {
         this.id = id;
         this.existingEvents = Collections.<SubscriptionTimeline.ExistingEvent>emptyList();
-        this.deletedEvents =  Collections.<SubscriptionTimeline.DeletedEvent>emptyList();
+        this.deletedEvents = Collections.<SubscriptionTimeline.DeletedEvent>emptyList();
         this.newEvents = Collections.<SubscriptionTimeline.NewEvent>emptyList();
     }
-    
-    public DefaultSubscriptionTimeline(SubscriptionTimeline input) {
+
+    public DefaultSubscriptionTimeline(final SubscriptionTimeline input) {
         this.id = input.getId();
-        this.existingEvents = (input.getExistingEvents() != null) ? new ArrayList<SubscriptionTimeline.ExistingEvent>(input.getExistingEvents()) : 
-            Collections.<SubscriptionTimeline.ExistingEvent>emptyList();
+        this.existingEvents = (input.getExistingEvents() != null) ? new ArrayList<SubscriptionTimeline.ExistingEvent>(input.getExistingEvents()) :
+                Collections.<SubscriptionTimeline.ExistingEvent>emptyList();
         sortExistingEvent(this.existingEvents);
-        this.deletedEvents = (input.getDeletedEvents() != null) ? new ArrayList<SubscriptionTimeline.DeletedEvent>(input.getDeletedEvents()) : 
-            Collections.<SubscriptionTimeline.DeletedEvent>emptyList();
-        this.newEvents = (input.getNewEvents() != null) ? new ArrayList<SubscriptionTimeline.NewEvent>(input.getNewEvents()) : 
-            Collections.<SubscriptionTimeline.NewEvent>emptyList();
+        this.deletedEvents = (input.getDeletedEvents() != null) ? new ArrayList<SubscriptionTimeline.DeletedEvent>(input.getDeletedEvents()) :
+                Collections.<SubscriptionTimeline.DeletedEvent>emptyList();
+        this.newEvents = (input.getNewEvents() != null) ? new ArrayList<SubscriptionTimeline.NewEvent>(input.getNewEvents()) :
+                Collections.<SubscriptionTimeline.NewEvent>emptyList();
         sortNewEvent(this.newEvents);
     }
-    
-     // CTOR for returning events only
-    public DefaultSubscriptionTimeline(SubscriptionDataRepair input, Catalog catalog) throws CatalogApiException {
+
+    // CTOR for returning events only
+    public DefaultSubscriptionTimeline(final SubscriptionDataRepair input, final Catalog catalog) throws CatalogApiException {
         this.id = input.getId();
         this.existingEvents = toExistingEvents(catalog, input.getActiveVersion(), input.getCategory(), input.getEvents());
         this.deletedEvents = null;
         this.newEvents = null;
     }
-    
-   private List<ExistingEvent> toExistingEvents(final Catalog catalog, final long activeVersion, final ProductCategory category, final List<EntitlementEvent> events) 
-       throws CatalogApiException {
-        
-        List<ExistingEvent> result = new LinkedList<SubscriptionTimeline.ExistingEvent>();
-        
-        String prevProductName = null; 
+
+    private List<ExistingEvent> toExistingEvents(final Catalog catalog, final long activeVersion, final ProductCategory category, final List<EntitlementEvent> events)
+            throws CatalogApiException {
+
+        final List<ExistingEvent> result = new LinkedList<SubscriptionTimeline.ExistingEvent>();
+
+        String prevProductName = null;
         BillingPeriod prevBillingPeriod = null;
         String prevPriceListName = null;
         PhaseType prevPhaseType = null;
-        
+
         DateTime startDate = null;
-        
+
         for (final EntitlementEvent cur : events) {
-            
+
             // First active event is used to figure out which catalog version to use.
             //startDate = (startDate == null && cur.getActiveVersion() == activeVersion) ?  cur.getEffectiveDate() : startDate;
-            
+
             // STEPH that needs tp be reviewed if we support mutli version events
             if (cur.getActiveVersion() != activeVersion) {
                 continue;
             }
-            startDate = (startDate == null) ?  cur.getEffectiveDate() : startDate;
-            
-            
-            String productName = null; 
+            startDate = (startDate == null) ? cur.getEffectiveDate() : startDate;
+
+
+            String productName = null;
+            BillingPeriod billingPeriod = null;
+            String priceListName = null;
+            PhaseType phaseType = null;
+
+            ApiEventType apiType = null;
+            switch (cur.getType()) {
+                case PHASE:
+                    final PhaseEvent phaseEV = (PhaseEvent) cur;
+                    phaseType = catalog.findPhase(phaseEV.getPhase(), cur.getEffectiveDate(), startDate).getPhaseType();
+                    productName = prevProductName;
+                    billingPeriod = catalog.findPhase(phaseEV.getPhase(), cur.getEffectiveDate(), startDate).getBillingPeriod();
+                    priceListName = prevPriceListName;
+                    break;
+
+                case API_USER:
+                    final ApiEvent userEV = (ApiEvent) cur;
+                    apiType = userEV.getEventType();
+                    final Plan plan = (userEV.getEventPlan() != null) ? catalog.findPlan(userEV.getEventPlan(), cur.getRequestedDate(), startDate) : null;
+                    phaseType = (userEV.getEventPlanPhase() != null) ? catalog.findPhase(userEV.getEventPlanPhase(), cur.getEffectiveDate(), startDate).getPhaseType() : prevPhaseType;
+                    productName = (plan != null) ? plan.getProduct().getName() : prevProductName;
+                    billingPeriod = (userEV.getEventPlanPhase() != null) ? catalog.findPhase(userEV.getEventPlanPhase(), cur.getEffectiveDate(), startDate).getBillingPeriod() : prevBillingPeriod;
+                    priceListName = (userEV.getPriceList() != null) ? userEV.getPriceList() : prevPriceListName;
+                    break;
+            }
+
+            final SubscriptionTransitionType transitionType = SubscriptionTransitionData.toSubscriptionTransitionType(cur.getType(), apiType);
+
+            final PlanPhaseSpecifier spec = new PlanPhaseSpecifier(productName, category, billingPeriod, priceListName, phaseType);
+            result.add(new ExistingEvent() {
+                @Override
+                public SubscriptionTransitionType getSubscriptionTransitionType() {
+                    return transitionType;
+                }
+
+                @Override
+                public DateTime getRequestedDate() {
+                    return cur.getRequestedDate();
+                }
+
+                @Override
+                public PlanPhaseSpecifier getPlanPhaseSpecifier() {
+                    return spec;
+                }
+
+                @Override
+                public UUID getEventId() {
+                    return cur.getId();
+                }
+
+                @Override
+                public DateTime getEffectiveDate() {
+                    return cur.getEffectiveDate();
+                }
+            });
+
+            prevProductName = productName;
+            prevBillingPeriod = billingPeriod;
+            prevPriceListName = priceListName;
+            prevPhaseType = phaseType;
+
+        }
+        sortExistingEvent(result);
+        return result;
+    }
+
+
+    /*
+
+    private List<ExistingEvent> toExistingEvents(final Catalog catalog, final long processingVersion, final ProductCategory category, final List<EntitlementEvent> events, List<ExistingEvent> result)
+        throws CatalogApiException {
+
+
+        String prevProductName = null;
+        BillingPeriod prevBillingPeriod = null;
+        String prevPriceListName = null;
+        PhaseType prevPhaseType = null;
+
+        DateTime startDate = null;
+
+        for (final EntitlementEvent cur : events) {
+
+            if (processingVersion != cur.getActiveVersion()) {
+                continue;
+            }
+
+            // First active event is used to figure out which catalog version to use.
+            startDate = (startDate == null && cur.getActiveVersion() == processingVersion) ?  cur.getEffectiveDate() : startDate;
+
+            String productName = null;
             BillingPeriod billingPeriod = null;
             String priceListName = null;
             PhaseType phaseType = null;
@@ -107,7 +196,7 @@ public class DefaultSubscriptionTimeline implements SubscriptionTimeline  {
                 PhaseEvent phaseEV = (PhaseEvent) cur;
                 phaseType = catalog.findPhase(phaseEV.getPhase(), cur.getEffectiveDate(), startDate).getPhaseType();
                 productName = prevProductName;
-                billingPeriod = catalog.findPhase(phaseEV.getPhase(), cur.getEffectiveDate(), startDate).getBillingPeriod();
+                billingPeriod = prevBillingPeriod;
                 priceListName = prevPriceListName;
                 break;
 
@@ -117,13 +206,13 @@ public class DefaultSubscriptionTimeline implements SubscriptionTimeline  {
                 Plan plan =  (userEV.getEventPlan() != null) ? catalog.findPlan(userEV.getEventPlan(), cur.getRequestedDate(), startDate) : null;
                 phaseType = (userEV.getEventPlanPhase() != null) ? catalog.findPhase(userEV.getEventPlanPhase(), cur.getEffectiveDate(), startDate).getPhaseType() : prevPhaseType;
                 productName = (plan != null) ? plan.getProduct().getName() : prevProductName;
-                billingPeriod = (userEV.getEventPlanPhase() != null) ? catalog.findPhase(userEV.getEventPlanPhase(), cur.getEffectiveDate(), startDate).getBillingPeriod() : prevBillingPeriod;
+                billingPeriod = (plan != null) ? plan.getBillingPeriod() : prevBillingPeriod;
                 priceListName = (userEV.getPriceList() != null) ? userEV.getPriceList() : prevPriceListName;
                 break;
             }
 
             final SubscriptionTransitionType transitionType = SubscriptionTransitionData.toSubscriptionTransitionType(cur.getType(), apiType);
-            
+
             final PlanPhaseSpecifier spec = new PlanPhaseSpecifier(productName, category, billingPeriod, priceListName, phaseType);
             result.add(new ExistingEvent() {
                 @Override
@@ -147,109 +236,20 @@ public class DefaultSubscriptionTimeline implements SubscriptionTimeline  {
                     return cur.getEffectiveDate();
                 }
             });
-            
-            prevProductName = productName; 
+            prevProductName = productName;
             prevBillingPeriod = billingPeriod;
             prevPriceListName = priceListName;
             prevPhaseType = phaseType;
-
         }
-        sortExistingEvent(result);
-        return result;
     }
-   
-   
-   /*
-   
-   private List<ExistingEvent> toExistingEvents(final Catalog catalog, final long processingVersion, final ProductCategory category, final List<EntitlementEvent> events, List<ExistingEvent> result)
-       throws CatalogApiException {
-       
-       
-       String prevProductName = null; 
-       BillingPeriod prevBillingPeriod = null;
-       String prevPriceListName = null;
-       PhaseType prevPhaseType = null;
-       
-       DateTime startDate = null;
-       
-       for (final EntitlementEvent cur : events) {
-           
-           if (processingVersion != cur.getActiveVersion()) {
-               continue;
-           }
-           
-           // First active event is used to figure out which catalog version to use.
-           startDate = (startDate == null && cur.getActiveVersion() == processingVersion) ?  cur.getEffectiveDate() : startDate;
-           
-           String productName = null; 
-           BillingPeriod billingPeriod = null;
-           String priceListName = null;
-           PhaseType phaseType = null;
-
-           ApiEventType apiType = null;
-           switch (cur.getType()) {
-           case PHASE:
-               PhaseEvent phaseEV = (PhaseEvent) cur;
-               phaseType = catalog.findPhase(phaseEV.getPhase(), cur.getEffectiveDate(), startDate).getPhaseType();
-               productName = prevProductName;
-               billingPeriod = prevBillingPeriod;
-               priceListName = prevPriceListName;
-               break;
-
-           case API_USER:
-               ApiEvent userEV = (ApiEvent) cur;
-               apiType = userEV.getEventType();
-               Plan plan =  (userEV.getEventPlan() != null) ? catalog.findPlan(userEV.getEventPlan(), cur.getRequestedDate(), startDate) : null;
-               phaseType = (userEV.getEventPlanPhase() != null) ? catalog.findPhase(userEV.getEventPlanPhase(), cur.getEffectiveDate(), startDate).getPhaseType() : prevPhaseType;
-               productName = (plan != null) ? plan.getProduct().getName() : prevProductName;
-               billingPeriod = (plan != null) ? plan.getBillingPeriod() : prevBillingPeriod;
-               priceListName = (userEV.getPriceList() != null) ? userEV.getPriceList() : prevPriceListName;
-               break;
-           }
-
-           final SubscriptionTransitionType transitionType = SubscriptionTransitionData.toSubscriptionTransitionType(cur.getType(), apiType);
-           
-           final PlanPhaseSpecifier spec = new PlanPhaseSpecifier(productName, category, billingPeriod, priceListName, phaseType);
-           result.add(new ExistingEvent() {
-               @Override
-               public SubscriptionTransitionType getSubscriptionTransitionType() {
-                   return transitionType;
-               }
-               @Override
-               public DateTime getRequestedDate() {
-                   return cur.getRequestedDate();
-               }
-               @Override
-               public PlanPhaseSpecifier getPlanPhaseSpecifier() {
-                   return spec;
-               }
-               @Override
-               public UUID getEventId() {
-                   return cur.getId();
-               }
-               @Override
-               public DateTime getEffectiveDate() {
-                   return cur.getEffectiveDate();
-               }
-           });
-           prevProductName = productName; 
-           prevBillingPeriod = billingPeriod;
-           prevPriceListName = priceListName;
-           prevPhaseType = phaseType;
-       }
-   }
-   */
-   
-   
-    
-    
-    
-    
+    */
+
+
     @Override
     public UUID getId() {
         return id;
     }
-    
+
     @Override
     public List<DeletedEvent> getDeletedEvents() {
         return deletedEvents;
@@ -259,27 +259,28 @@ public class DefaultSubscriptionTimeline implements SubscriptionTimeline  {
     public List<NewEvent> getNewEvents() {
         return newEvents;
     }
-    
+
     @Override
     public List<ExistingEvent> getExistingEvents() {
         return existingEvents;
     }
-    
+
     private void sortExistingEvent(final List<ExistingEvent> events) {
         if (events != null) {
             Collections.sort(events, new Comparator<ExistingEvent>() {
                 @Override
-                public int compare(ExistingEvent arg0, ExistingEvent arg1) {
+                public int compare(final ExistingEvent arg0, final ExistingEvent arg1) {
                     return arg0.getEffectiveDate().compareTo(arg1.getEffectiveDate());
                 }
             });
         }
     }
+
     private void sortNewEvent(final List<NewEvent> events) {
         if (events != null) {
             Collections.sort(events, new Comparator<NewEvent>() {
                 @Override
-                public int compare(NewEvent arg0, NewEvent arg1) {
+                public int compare(final NewEvent arg0, final NewEvent arg1) {
                     return arg0.getRequestedDate().compareTo(arg1.getRequestedDate());
                 }
             });

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/RepairEntitlementLifecycleDao.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/RepairEntitlementLifecycleDao.java
index dff77b3..0cc98bf 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/RepairEntitlementLifecycleDao.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/RepairEntitlementLifecycleDao.java
@@ -23,6 +23,6 @@ import com.ning.billing.entitlement.events.EntitlementEvent;
 public interface RepairEntitlementLifecycleDao {
 
     public void initializeRepair(final UUID subscriptionId, final List<EntitlementEvent> initialEvents);
-    
+
     public void cleanup();
 }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/RepairSubscriptionApiService.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/RepairSubscriptionApiService.java
index dcc0c95..37078d5 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/RepairSubscriptionApiService.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/RepairSubscriptionApiService.java
@@ -29,8 +29,8 @@ import com.ning.billing.util.clock.Clock;
 public class RepairSubscriptionApiService extends DefaultSubscriptionApiService implements SubscriptionApiService {
 
     @Inject
-    public RepairSubscriptionApiService(Clock clock, @Named(DefaultEntitlementModule.REPAIR_NAMED) EntitlementDao dao,
-            CatalogService catalogService, PlanAligner planAligner) {
+    public RepairSubscriptionApiService(final Clock clock, @Named(DefaultEntitlementModule.REPAIR_NAMED) final EntitlementDao dao,
+                                        final CatalogService catalogService, final PlanAligner planAligner) {
         super(clock, dao, catalogService, planAligner);
     }
 }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/RepairSubscriptionFactory.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/RepairSubscriptionFactory.java
index 61933c3..e09989d 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/RepairSubscriptionFactory.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/RepairSubscriptionFactory.java
@@ -22,10 +22,8 @@ import com.google.inject.name.Named;
 import com.ning.billing.catalog.api.CatalogService;
 import com.ning.billing.entitlement.api.SubscriptionApiService;
 import com.ning.billing.entitlement.api.SubscriptionFactory;
-import com.ning.billing.entitlement.api.user.DefaultSubscriptionApiService;
 import com.ning.billing.entitlement.api.user.DefaultSubscriptionFactory;
 import com.ning.billing.entitlement.api.user.SubscriptionData;
-import com.ning.billing.entitlement.api.user.DefaultSubscriptionFactory.SubscriptionBuilder;
 import com.ning.billing.entitlement.engine.addon.AddonUtils;
 import com.ning.billing.entitlement.engine.dao.EntitlementDao;
 import com.ning.billing.entitlement.events.EntitlementEvent;
@@ -36,20 +34,20 @@ public class RepairSubscriptionFactory extends DefaultSubscriptionFactory implem
 
     private final AddonUtils addonUtils;
     private final EntitlementDao repairDao;
-    
+
     @Inject
-    public RepairSubscriptionFactory(@Named(DefaultEntitlementModule.REPAIR_NAMED) SubscriptionApiService apiService,
-            @Named(DefaultEntitlementModule.REPAIR_NAMED) EntitlementDao dao,
-            Clock clock, CatalogService catalogService, AddonUtils addonUtils) {
+    public RepairSubscriptionFactory(@Named(DefaultEntitlementModule.REPAIR_NAMED) final SubscriptionApiService apiService,
+                                     @Named(DefaultEntitlementModule.REPAIR_NAMED) final EntitlementDao dao,
+                                     final Clock clock, final CatalogService catalogService, final AddonUtils addonUtils) {
         super(apiService, clock, catalogService);
         this.addonUtils = addonUtils;
         this.repairDao = dao;
     }
-     
+
     @Override
-    public SubscriptionData createSubscription(SubscriptionBuilder builder,
-            List<EntitlementEvent> events) {
-        SubscriptionData subscription = new SubscriptionDataRepair(builder, events, apiService, repairDao, clock, addonUtils, catalogService);
+    public SubscriptionData createSubscription(final SubscriptionBuilder builder,
+                                               final List<EntitlementEvent> events) {
+        final SubscriptionData subscription = new SubscriptionDataRepair(builder, events, apiService, repairDao, clock, addonUtils, catalogService);
         subscription.rebuildTransitions(events, catalogService.getFullCatalog());
         return subscription;
     }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/SubscriptionDataRepair.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/SubscriptionDataRepair.java
index 7f526d4..85c42a6 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/SubscriptionDataRepair.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/SubscriptionDataRepair.java
@@ -33,9 +33,9 @@ import com.ning.billing.catalog.api.Product;
 import com.ning.billing.catalog.api.ProductCategory;
 import com.ning.billing.entitlement.api.SubscriptionApiService;
 import com.ning.billing.entitlement.api.SubscriptionTransitionType;
+import com.ning.billing.entitlement.api.user.DefaultSubscriptionFactory.SubscriptionBuilder;
 import com.ning.billing.entitlement.api.user.EntitlementUserApiException;
 import com.ning.billing.entitlement.api.user.SubscriptionData;
-import com.ning.billing.entitlement.api.user.DefaultSubscriptionFactory.SubscriptionBuilder;
 import com.ning.billing.entitlement.api.user.SubscriptionTransitionData;
 import com.ning.billing.entitlement.engine.addon.AddonUtils;
 import com.ning.billing.entitlement.engine.dao.EntitlementDao;
@@ -43,7 +43,6 @@ import com.ning.billing.entitlement.events.EntitlementEvent;
 import com.ning.billing.entitlement.events.EntitlementEvent.EventType;
 import com.ning.billing.entitlement.events.user.ApiEventBuilder;
 import com.ning.billing.entitlement.events.user.ApiEventCancel;
-
 import com.ning.billing.util.callcontext.CallContext;
 import com.ning.billing.util.clock.Clock;
 
@@ -53,15 +52,15 @@ public class SubscriptionDataRepair extends SubscriptionData {
     private final Clock clock;
     private final EntitlementDao repairDao;
     private final CatalogService catalogService;
-    
+
     private final List<EntitlementEvent> initialEvents;
 
     // Low level events are ONLY used for Repair APIs
     protected List<EntitlementEvent> events;
 
 
-    public SubscriptionDataRepair(SubscriptionBuilder builder, List<EntitlementEvent> initialEvents, SubscriptionApiService apiService,
-            EntitlementDao dao, Clock clock, AddonUtils addonUtils, CatalogService catalogService) {
+    public SubscriptionDataRepair(final SubscriptionBuilder builder, final List<EntitlementEvent> initialEvents, final SubscriptionApiService apiService,
+                                  final EntitlementDao dao, final Clock clock, final AddonUtils addonUtils, final CatalogService catalogService) {
         super(builder, apiService, clock);
         this.repairDao = dao;
         this.addonUtils = addonUtils;
@@ -70,10 +69,10 @@ public class SubscriptionDataRepair extends SubscriptionData {
         this.initialEvents = initialEvents;
     }
 
-    
+
     DateTime getLastUserEventEffectiveDate() {
         DateTime res = null;
-        for (EntitlementEvent cur : events) {
+        for (final EntitlementEvent cur : events) {
             if (cur.getActiveVersion() != getActiveVersion()) {
                 break;
             }
@@ -86,29 +85,29 @@ public class SubscriptionDataRepair extends SubscriptionData {
     }
 
     public void addNewRepairEvent(final DefaultNewEvent input, final SubscriptionDataRepair baseSubscription, final List<SubscriptionDataRepair> addonSubscriptions, final CallContext context)
-    throws EntitlementRepairException {
+            throws EntitlementRepairException {
 
         try {
             final PlanPhaseSpecifier spec = input.getPlanPhaseSpecifier();
-            switch(input.getSubscriptionTransitionType()) {
-            case CREATE:
-            case RE_CREATE:
-                recreate(spec, input.getRequestedDate(), context);
-                checkAddonRights(baseSubscription);
-                break;
-            case CHANGE:
-                changePlan(spec.getProductName(), spec.getBillingPeriod(), spec.getPriceListName(), input.getRequestedDate(), context);
-                checkAddonRights(baseSubscription);
-                trickleDownBPEffectForAddon(addonSubscriptions, getLastUserEventEffectiveDate(), context);
-                break;
-            case CANCEL:
-                cancel(input.getRequestedDate(), false, context);
-                trickleDownBPEffectForAddon(addonSubscriptions, getLastUserEventEffectiveDate(), context);
-                break;
-            case PHASE:
-                break;
-            default:
-                throw new EntitlementRepairException(ErrorCode.ENT_REPAIR_UNKNOWN_TYPE, input.getSubscriptionTransitionType(), id);
+            switch (input.getSubscriptionTransitionType()) {
+                case CREATE:
+                case RE_CREATE:
+                    recreate(spec, input.getRequestedDate(), context);
+                    checkAddonRights(baseSubscription);
+                    break;
+                case CHANGE:
+                    changePlan(spec.getProductName(), spec.getBillingPeriod(), spec.getPriceListName(), input.getRequestedDate(), context);
+                    checkAddonRights(baseSubscription);
+                    trickleDownBPEffectForAddon(addonSubscriptions, getLastUserEventEffectiveDate(), context);
+                    break;
+                case CANCEL:
+                    cancel(input.getRequestedDate(), false, context);
+                    trickleDownBPEffectForAddon(addonSubscriptions, getLastUserEventEffectiveDate(), context);
+                    break;
+                case PHASE:
+                    break;
+                default:
+                    throw new EntitlementRepairException(ErrorCode.ENT_REPAIR_UNKNOWN_TYPE, input.getSubscriptionTransitionType(), id);
             }
         } catch (EntitlementUserApiException e) {
             throw new EntitlementRepairException(e);
@@ -118,72 +117,71 @@ public class SubscriptionDataRepair extends SubscriptionData {
     }
 
 
-    public void addFutureAddonCancellation(List<SubscriptionDataRepair> addOnSubscriptionInRepair, final CallContext context) {
+    public void addFutureAddonCancellation(final List<SubscriptionDataRepair> addOnSubscriptionInRepair, final CallContext context) {
 
         if (category != ProductCategory.BASE) {
             return;
         }
 
-        SubscriptionTransitionData pendingTransition = getPendingTransitionData();
+        final SubscriptionTransitionData pendingTransition = getPendingTransitionData();
         if (pendingTransition == null) {
             return;
         }
-        Product baseProduct = (pendingTransition.getTransitionType() == SubscriptionTransitionType.CANCEL) ? null : 
-            pendingTransition.getNextPlan().getProduct();
+        final Product baseProduct = (pendingTransition.getTransitionType() == SubscriptionTransitionType.CANCEL) ? null :
+                pendingTransition.getNextPlan().getProduct();
 
         addAddonCancellationIfRequired(addOnSubscriptionInRepair, baseProduct, pendingTransition.getEffectiveTransitionTime(), context);
     }
-    
+
     private void trickleDownBPEffectForAddon(final List<SubscriptionDataRepair> addOnSubscriptionInRepair, final DateTime effectiveDate, final CallContext context)
-     throws EntitlementUserApiException {
+            throws EntitlementUserApiException {
 
         if (category != ProductCategory.BASE) {
             return;
         }
 
-        Product baseProduct = (getState() == SubscriptionState.CANCELLED ) ?
+        final Product baseProduct = (getState() == SubscriptionState.CANCELLED) ?
                 null : getCurrentPlan().getProduct();
         addAddonCancellationIfRequired(addOnSubscriptionInRepair, baseProduct, effectiveDate, context);
     }
-    
-    
-    
-    private void addAddonCancellationIfRequired(final List<SubscriptionDataRepair> addOnSubscriptionInRepair, Product baseProduct, final DateTime effectiveDate, final CallContext context) {
 
-        DateTime now = clock.getUTCNow();
-        Iterator<SubscriptionDataRepair> it = addOnSubscriptionInRepair.iterator();
+
+    private void addAddonCancellationIfRequired(final List<SubscriptionDataRepair> addOnSubscriptionInRepair, final Product baseProduct, final DateTime effectiveDate, final CallContext context) {
+
+        final DateTime now = clock.getUTCNow();
+        final Iterator<SubscriptionDataRepair> it = addOnSubscriptionInRepair.iterator();
         while (it.hasNext()) {
-            SubscriptionDataRepair cur = it.next();
+            final SubscriptionDataRepair cur = it.next();
             if (cur.getState() == SubscriptionState.CANCELLED ||
                     cur.getCategory() != ProductCategory.ADD_ON) {
                 continue;
             }
-            Plan addonCurrentPlan = cur.getCurrentPlan();
+            final Plan addonCurrentPlan = cur.getCurrentPlan();
             if (baseProduct == null ||
                     addonUtils.isAddonIncluded(baseProduct, addonCurrentPlan) ||
-                    ! addonUtils.isAddonAvailable(baseProduct, addonCurrentPlan)) {
-
-                EntitlementEvent cancelEvent = new ApiEventCancel(new ApiEventBuilder()
-                .setSubscriptionId(cur.getId())
-                .setActiveVersion(cur.getActiveVersion())
-                .setProcessedDate(now)
-                .setEffectiveDate(effectiveDate)
-                .setRequestedDate(now)
-                .setUserToken(context.getUserToken())
-                .setFromDisk(true));
+                    !addonUtils.isAddonAvailable(baseProduct, addonCurrentPlan)) {
+
+                final EntitlementEvent cancelEvent = new ApiEventCancel(new ApiEventBuilder()
+                                                                          .setSubscriptionId(cur.getId())
+                                                                          .setActiveVersion(cur.getActiveVersion())
+                                                                          .setProcessedDate(now)
+                                                                          .setEffectiveDate(effectiveDate)
+                                                                          .setRequestedDate(now)
+                                                                          .setUserToken(context.getUserToken())
+                                                                          .setFromDisk(true));
                 repairDao.cancelSubscription(cur.getId(), cancelEvent, context, 0);
                 cur.rebuildTransitions(repairDao.getEventsForSubscription(cur.getId()), catalogService.getFullCatalog());
             }
         }
     }
 
-    private void checkAddonRights(final SubscriptionDataRepair baseSubscription) 
-        throws EntitlementUserApiException, CatalogApiException  {
+    private void checkAddonRights(final SubscriptionDataRepair baseSubscription)
+            throws EntitlementUserApiException, CatalogApiException {
         if (category == ProductCategory.ADD_ON) {
             addonUtils.checkAddonCreationRights(baseSubscription, getCurrentPlan());
         }
     }
-    
+
     public void rebuildTransitions(final List<EntitlementEvent> inputEvents, final Catalog catalog) {
         this.events = inputEvents;
         super.rebuildTransitions(inputEvents, catalog);
@@ -197,12 +195,12 @@ public class SubscriptionDataRepair extends SubscriptionData {
         return initialEvents;
     }
 
-    
+
     public Collection<EntitlementEvent> getNewEvents() {
-        Collection<EntitlementEvent> newEvents  = Collections2.filter(events, new Predicate<EntitlementEvent>() {
+        final Collection<EntitlementEvent> newEvents = Collections2.filter(events, new Predicate<EntitlementEvent>() {
             @Override
-            public boolean apply(EntitlementEvent input) {
-                return ! initialEvents.contains(input);
+            public boolean apply(final EntitlementEvent input) {
+                return !initialEvents.contains(input);
             }
         });
         return newEvents;

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultEntitlementUserApi.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultEntitlementUserApi.java
index 7d92852..2b26c87 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultEntitlementUserApi.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultEntitlementUserApi.java
@@ -33,8 +33,8 @@ import com.ning.billing.catalog.api.PlanPhaseSpecifier;
 import com.ning.billing.catalog.api.PriceListSet;
 import com.ning.billing.catalog.api.ProductCategory;
 import com.ning.billing.entitlement.api.SubscriptionFactory;
-import com.ning.billing.entitlement.api.user.Subscription.SubscriptionState;
 import com.ning.billing.entitlement.api.user.DefaultSubscriptionFactory.SubscriptionBuilder;
+import com.ning.billing.entitlement.api.user.Subscription.SubscriptionState;
 import com.ning.billing.entitlement.api.user.SubscriptionStatusDryRun.DryRunChangeReason;
 import com.ning.billing.entitlement.engine.addon.AddonUtils;
 import com.ning.billing.entitlement.engine.dao.EntitlementDao;
@@ -52,8 +52,8 @@ public class DefaultEntitlementUserApi implements EntitlementUserApi {
     private final SubscriptionFactory subscriptionFactory;
 
     @Inject
-    public DefaultEntitlementUserApi(Clock clock, EntitlementDao dao, CatalogService catalogService,
-            DefaultSubscriptionApiService apiService, final SubscriptionFactory subscriptionFactory, AddonUtils addonUtils) {
+    public DefaultEntitlementUserApi(final Clock clock, final EntitlementDao dao, final CatalogService catalogService,
+                                     final DefaultSubscriptionApiService apiService, final SubscriptionFactory subscriptionFactory, final AddonUtils addonUtils) {
         super();
         this.clock = clock;
         this.apiService = apiService;
@@ -63,10 +63,10 @@ public class DefaultEntitlementUserApi implements EntitlementUserApi {
         this.subscriptionFactory = subscriptionFactory;
     }
 
-    
+
     @Override
-    public SubscriptionBundle getBundleFromId(UUID id) throws EntitlementUserApiException {
-        SubscriptionBundle result = dao.getSubscriptionBundleFromId(id);
+    public SubscriptionBundle getBundleFromId(final UUID id) throws EntitlementUserApiException {
+        final SubscriptionBundle result = dao.getSubscriptionBundleFromId(id);
         if (result == null) {
             throw new EntitlementUserApiException(ErrorCode.ENT_GET_INVALID_BUNDLE_ID, id.toString());
         }
@@ -74,8 +74,8 @@ public class DefaultEntitlementUserApi implements EntitlementUserApi {
     }
 
     @Override
-    public Subscription getSubscriptionFromId(UUID id) throws EntitlementUserApiException {
-        Subscription result = dao.getSubscriptionFromId(subscriptionFactory, id);
+    public Subscription getSubscriptionFromId(final UUID id) throws EntitlementUserApiException {
+        final Subscription result = dao.getSubscriptionFromId(subscriptionFactory, id);
         if (result == null) {
             throw new EntitlementUserApiException(ErrorCode.ENT_INVALID_SUBSCRIPTION_ID, id);
         }
@@ -83,8 +83,8 @@ public class DefaultEntitlementUserApi implements EntitlementUserApi {
     }
 
     @Override
-    public SubscriptionBundle getBundleForKey(String bundleKey) throws EntitlementUserApiException {
-        SubscriptionBundle result =  dao.getSubscriptionBundleFromKey(bundleKey);
+    public SubscriptionBundle getBundleForKey(final String bundleKey) throws EntitlementUserApiException {
+        final SubscriptionBundle result = dao.getSubscriptionBundleFromKey(bundleKey);
         if (result == null) {
             throw new EntitlementUserApiException(ErrorCode.ENT_GET_INVALID_BUNDLE_KEY, bundleKey);
         }
@@ -92,106 +92,106 @@ public class DefaultEntitlementUserApi implements EntitlementUserApi {
     }
 
     @Override
-    public List<SubscriptionBundle> getBundlesForAccount(UUID accountId) {
+    public List<SubscriptionBundle> getBundlesForAccount(final UUID accountId) {
         return dao.getSubscriptionBundleForAccount(accountId);
     }
 
     @Override
-    public List<Subscription> getSubscriptionsForKey(String bundleKey) {
+    public List<Subscription> getSubscriptionsForKey(final String bundleKey) {
         return dao.getSubscriptionsForKey(subscriptionFactory, bundleKey);
     }
 
     @Override
-    public List<Subscription> getSubscriptionsForBundle(UUID bundleId) {
+    public List<Subscription> getSubscriptionsForBundle(final UUID bundleId) {
         return dao.getSubscriptions(subscriptionFactory, bundleId);
     }
 
     @Override
-    public Subscription getBaseSubscription(UUID bundleId) throws EntitlementUserApiException {
-        Subscription result =  dao.getBaseSubscription(subscriptionFactory, bundleId);
+    public Subscription getBaseSubscription(final UUID bundleId) throws EntitlementUserApiException {
+        final Subscription result = dao.getBaseSubscription(subscriptionFactory, bundleId);
         if (result == null) {
             throw new EntitlementUserApiException(ErrorCode.ENT_GET_NO_SUCH_BASE_SUBSCRIPTION, bundleId);
         }
         return result;
     }
-    
 
-    public SubscriptionBundle createBundleForAccount(UUID accountId, String bundleName, CallContext context)
-    throws EntitlementUserApiException {
-        SubscriptionBundleData bundle = new SubscriptionBundleData(bundleName, accountId, clock.getUTCNow());
+
+    public SubscriptionBundle createBundleForAccount(final UUID accountId, final String bundleName, final CallContext context)
+            throws EntitlementUserApiException {
+        final SubscriptionBundleData bundle = new SubscriptionBundleData(bundleName, accountId, clock.getUTCNow());
         return dao.createSubscriptionBundle(bundle, context);
     }
 
     @Override
-    public Subscription createSubscription(UUID bundleId, PlanPhaseSpecifier spec, DateTime requestedDate,
-                                           CallContext context) throws EntitlementUserApiException {
+    public Subscription createSubscription(final UUID bundleId, final PlanPhaseSpecifier spec, DateTime requestedDate,
+                                           final CallContext context) throws EntitlementUserApiException {
         try {
-            String realPriceList = (spec.getPriceListName() == null) ? PriceListSet.DEFAULT_PRICELIST_NAME : spec.getPriceListName();
-            DateTime now = clock.getUTCNow();
+            final String realPriceList = (spec.getPriceListName() == null) ? PriceListSet.DEFAULT_PRICELIST_NAME : spec.getPriceListName();
+            final DateTime now = clock.getUTCNow();
             requestedDate = (requestedDate != null) ? DefaultClock.truncateMs(requestedDate) : now;
             if (requestedDate.isAfter(now)) {
                 throw new EntitlementUserApiException(ErrorCode.ENT_INVALID_REQUESTED_DATE, requestedDate.toString());
             }
-            DateTime effectiveDate = requestedDate;
+            final DateTime effectiveDate = requestedDate;
 
-            Catalog catalog = catalogService.getFullCatalog();
-            Plan plan = catalog.findPlan(spec.getProductName(), spec.getBillingPeriod(), realPriceList, requestedDate);
+            final Catalog catalog = catalogService.getFullCatalog();
+            final Plan plan = catalog.findPlan(spec.getProductName(), spec.getBillingPeriod(), realPriceList, requestedDate);
 
-            PlanPhase phase = plan.getAllPhases()[0];
+            final PlanPhase phase = plan.getAllPhases()[0];
             if (phase == null) {
                 throw new EntitlementError(String.format("No initial PlanPhase for Product %s, term %s and set %s does not exist in the catalog",
-                        spec.getProductName(), spec.getBillingPeriod().toString(), realPriceList));
+                                                         spec.getProductName(), spec.getBillingPeriod().toString(), realPriceList));
             }
 
-            SubscriptionBundle bundle = dao.getSubscriptionBundleFromId(bundleId);
+            final SubscriptionBundle bundle = dao.getSubscriptionBundleFromId(bundleId);
             if (bundle == null) {
                 throw new EntitlementUserApiException(ErrorCode.ENT_CREATE_NO_BUNDLE, bundleId);
             }
 
             DateTime bundleStartDate = null;
-            SubscriptionData baseSubscription = (SubscriptionData) dao.getBaseSubscription(subscriptionFactory, bundleId);
-            switch(plan.getProduct().getCategory()) {
-            case BASE:
-                if (baseSubscription != null) {
-                    if (baseSubscription.getState() == SubscriptionState.ACTIVE) {
+            final SubscriptionData baseSubscription = (SubscriptionData) dao.getBaseSubscription(subscriptionFactory, bundleId);
+            switch (plan.getProduct().getCategory()) {
+                case BASE:
+                    if (baseSubscription != null) {
+                        if (baseSubscription.getState() == SubscriptionState.ACTIVE) {
+                            throw new EntitlementUserApiException(ErrorCode.ENT_CREATE_BP_EXISTS, bundleId);
+                        } else {
+                            // If we do create on an existing CANCELLED BP, this is equivalent to call recreate on that Subscription.
+                            baseSubscription.recreate(spec, requestedDate, context);
+                            return baseSubscription;
+                        }
+                    }
+                    bundleStartDate = requestedDate;
+                    break;
+                case ADD_ON:
+                    if (baseSubscription == null) {
+                        throw new EntitlementUserApiException(ErrorCode.ENT_CREATE_NO_BP, bundleId);
+                    }
+                    if (effectiveDate.isBefore(baseSubscription.getStartDate())) {
+                        throw new EntitlementUserApiException(ErrorCode.ENT_INVALID_REQUESTED_DATE, requestedDate.toString());
+                    }
+                    addonUtils.checkAddonCreationRights(baseSubscription, plan);
+                    bundleStartDate = baseSubscription.getStartDate();
+                    break;
+                case STANDALONE:
+                    if (baseSubscription != null) {
                         throw new EntitlementUserApiException(ErrorCode.ENT_CREATE_BP_EXISTS, bundleId);
-                    } else {
-                        // If we do create on an existing CANCELLED BP, this is equivalent to call recreate on that Subscription.
-                        baseSubscription.recreate(spec, requestedDate, context);
-                        return baseSubscription;
                     }
-                }
-                bundleStartDate = requestedDate;
-                break;
-            case ADD_ON:
-                if (baseSubscription == null) {
-                    throw new EntitlementUserApiException(ErrorCode.ENT_CREATE_NO_BP, bundleId);
-                }
-                if (effectiveDate.isBefore(baseSubscription.getStartDate())) {
-                    throw new EntitlementUserApiException(ErrorCode.ENT_INVALID_REQUESTED_DATE, requestedDate.toString());
-                }
-                addonUtils.checkAddonCreationRights(baseSubscription, plan);
-                bundleStartDate = baseSubscription.getStartDate();
-                break;
-            case STANDALONE:
-                if (baseSubscription != null) {
-                    throw new EntitlementUserApiException(ErrorCode.ENT_CREATE_BP_EXISTS, bundleId);
-                }
-                // Not really but we don't care, there is no alignment for STANDALONE subscriptions
-                bundleStartDate = requestedDate;
-                break;
-            default:
-                throw new EntitlementError(String.format("Can't create subscription of type %s",
-                        plan.getProduct().getCategory().toString()));
+                    // Not really but we don't care, there is no alignment for STANDALONE subscriptions
+                    bundleStartDate = requestedDate;
+                    break;
+                default:
+                    throw new EntitlementError(String.format("Can't create subscription of type %s",
+                                                             plan.getProduct().getCategory().toString()));
             }
 
-            SubscriptionData subscription = apiService.createPlan(new SubscriptionBuilder()
-                 .setId(UUID.randomUUID())
-                .setBundleId(bundleId)
-                .setCategory(plan.getProduct().getCategory())
-                .setBundleStartDate(bundleStartDate)
-                .setStartDate(effectiveDate),
-            plan, spec.getPhaseType(), realPriceList, requestedDate, effectiveDate, now, context);
+            final SubscriptionData subscription = apiService.createPlan(new SubscriptionBuilder()
+                                                                          .setId(UUID.randomUUID())
+                                                                          .setBundleId(bundleId)
+                                                                          .setCategory(plan.getProduct().getCategory())
+                                                                          .setBundleStartDate(bundleStartDate)
+                                                                          .setStartDate(effectiveDate),
+                                                                  plan, spec.getPhaseType(), realPriceList, requestedDate, effectiveDate, now, context);
 
             return subscription;
         } catch (CatalogApiException e) {
@@ -201,14 +201,14 @@ public class DefaultEntitlementUserApi implements EntitlementUserApi {
 
 
     @Override
-    public DateTime getNextBillingDate(UUID accountId) {
-        List<SubscriptionBundle> bundles = getBundlesForAccount(accountId);
+    public DateTime getNextBillingDate(final UUID accountId) {
+        final List<SubscriptionBundle> bundles = getBundlesForAccount(accountId);
         DateTime result = null;
-        for(SubscriptionBundle bundle : bundles) {
-            List<Subscription> subscriptions = getSubscriptionsForBundle(bundle.getId());
-            for(Subscription subscription : subscriptions) {
-                DateTime chargedThruDate = subscription.getChargedThroughDate();
-                if(result == null ||
+        for (final SubscriptionBundle bundle : bundles) {
+            final List<Subscription> subscriptions = getSubscriptionsForBundle(bundle.getId());
+            for (final Subscription subscription : subscriptions) {
+                final DateTime chargedThruDate = subscription.getChargedThroughDate();
+                if (result == null ||
                         (chargedThruDate != null && chargedThruDate.isBefore(result))) {
                     result = subscription.getChargedThroughDate();
                 }
@@ -219,25 +219,25 @@ public class DefaultEntitlementUserApi implements EntitlementUserApi {
 
 
     @Override
-    public List<SubscriptionStatusDryRun> getDryRunChangePlanStatus(UUID subscriptionId, String baseProductName, DateTime requestedDate)
+    public List<SubscriptionStatusDryRun> getDryRunChangePlanStatus(final UUID subscriptionId, final String baseProductName, final DateTime requestedDate)
             throws EntitlementUserApiException {
 
-        Subscription subscription = dao.getSubscriptionFromId(subscriptionFactory, subscriptionId);
+        final Subscription subscription = dao.getSubscriptionFromId(subscriptionFactory, subscriptionId);
         if (subscription == null) {
             throw new EntitlementUserApiException(ErrorCode.ENT_INVALID_SUBSCRIPTION_ID, subscriptionId);
         }
         if (subscription.getCategory() != ProductCategory.BASE) {
             throw new EntitlementUserApiException(ErrorCode.ENT_CHANGE_DRY_RUN_NOT_BP);
         }
-        
-        List<SubscriptionStatusDryRun> result = new LinkedList<SubscriptionStatusDryRun>();
-        
-        List<Subscription> bundleSubscriptions = dao.getSubscriptions(subscriptionFactory, subscription.getBundleId());
-        for (Subscription cur : bundleSubscriptions) {
+
+        final List<SubscriptionStatusDryRun> result = new LinkedList<SubscriptionStatusDryRun>();
+
+        final List<Subscription> bundleSubscriptions = dao.getSubscriptions(subscriptionFactory, subscription.getBundleId());
+        for (final Subscription cur : bundleSubscriptions) {
             if (cur.getId().equals(subscriptionId)) {
                 continue;
             }
-            
+
             DryRunChangeReason reason = null;
             if (addonUtils.isAddonIncludedFromProdName(baseProductName, requestedDate, cur.getCurrentPlan())) {
                 reason = DryRunChangeReason.AO_INCLUDED_IN_NEW_PLAN;
@@ -246,10 +246,10 @@ public class DefaultEntitlementUserApi implements EntitlementUserApi {
             } else {
                 reason = DryRunChangeReason.AO_NOT_AVAILABLE_IN_NEW_PLAN;
             }
-            SubscriptionStatusDryRun status = new DefaultSubscriptionStatusDryRun(cur.getId(), 
-                    cur.getCurrentPlan().getProduct().getName(), cur.getCurrentPhase().getPhaseType(),
-                    cur.getCurrentPlan().getBillingPeriod(),
-                    cur.getCurrentPriceList().getName(), reason);
+            final SubscriptionStatusDryRun status = new DefaultSubscriptionStatusDryRun(cur.getId(),
+                                                                                  cur.getCurrentPlan().getProduct().getName(), cur.getCurrentPhase().getPhaseType(),
+                                                                                  cur.getCurrentPlan().getBillingPeriod(),
+                                                                                  cur.getCurrentPriceList().getName(), reason);
             result.add(status);
         }
         return result;

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultSubscriptionApiService.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultSubscriptionApiService.java
index 7783c42..327edb4 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultSubscriptionApiService.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultSubscriptionApiService.java
@@ -39,8 +39,8 @@ import com.ning.billing.catalog.api.Product;
 import com.ning.billing.entitlement.alignment.PlanAligner;
 import com.ning.billing.entitlement.alignment.TimedPhase;
 import com.ning.billing.entitlement.api.SubscriptionApiService;
-import com.ning.billing.entitlement.api.user.Subscription.SubscriptionState;
 import com.ning.billing.entitlement.api.user.DefaultSubscriptionFactory.SubscriptionBuilder;
+import com.ning.billing.entitlement.api.user.Subscription.SubscriptionState;
 import com.ning.billing.entitlement.engine.dao.EntitlementDao;
 import com.ning.billing.entitlement.events.EntitlementEvent;
 import com.ning.billing.entitlement.events.phase.PhaseEvent;
@@ -65,48 +65,47 @@ public class DefaultSubscriptionApiService implements SubscriptionApiService {
     private final PlanAligner planAligner;
 
     @Inject
-    public DefaultSubscriptionApiService(Clock clock, EntitlementDao dao, CatalogService catalogService, PlanAligner planAligner) {
+    public DefaultSubscriptionApiService(final Clock clock, final EntitlementDao dao, final CatalogService catalogService, final PlanAligner planAligner) {
         this.clock = clock;
         this.catalogService = catalogService;
         this.planAligner = planAligner;
         this.dao = dao;
     }
 
-    public SubscriptionData createPlan(SubscriptionBuilder builder, Plan plan, PhaseType initialPhase,
-            String realPriceList, DateTime requestedDate, DateTime effectiveDate, DateTime processedDate,
-            CallContext context)
-        throws EntitlementUserApiException {
-        SubscriptionData subscription = new SubscriptionData(builder, this, clock);
+    public SubscriptionData createPlan(final SubscriptionBuilder builder, final Plan plan, final PhaseType initialPhase,
+                                       final String realPriceList, final DateTime requestedDate, final DateTime effectiveDate, final DateTime processedDate,
+                                       final CallContext context)
+            throws EntitlementUserApiException {
+        final SubscriptionData subscription = new SubscriptionData(builder, this, clock);
 
 
-        
         createFromSubscription(subscription, plan, initialPhase, realPriceList, requestedDate, effectiveDate, processedDate, false, context);
         return subscription;
     }
 
 
-    public boolean recreatePlan(SubscriptionData subscription, PlanPhaseSpecifier spec, DateTime requestedDate, CallContext context)
-    throws EntitlementUserApiException {
+    public boolean recreatePlan(final SubscriptionData subscription, final PlanPhaseSpecifier spec, DateTime requestedDate, final CallContext context)
+            throws EntitlementUserApiException {
 
-        SubscriptionState currentState = subscription.getState();
+        final SubscriptionState currentState = subscription.getState();
         if (currentState != null && currentState != SubscriptionState.CANCELLED) {
             throw new EntitlementUserApiException(ErrorCode.ENT_RECREATE_BAD_STATE, subscription.getId(), currentState);
         }
-        DateTime now = clock.getUTCNow();
+        final DateTime now = clock.getUTCNow();
         requestedDate = (requestedDate != null) ? DefaultClock.truncateMs(requestedDate) : now;
         validateRequestedDate(subscription, now, requestedDate);
 
         try {
-            String realPriceList = (spec.getPriceListName() == null) ? PriceListSet.DEFAULT_PRICELIST_NAME : spec.getPriceListName();
-            Plan plan = catalogService.getFullCatalog().findPlan(spec.getProductName(), spec.getBillingPeriod(), realPriceList, requestedDate);
-            PlanPhase phase = plan.getAllPhases()[0];
+            final String realPriceList = (spec.getPriceListName() == null) ? PriceListSet.DEFAULT_PRICELIST_NAME : spec.getPriceListName();
+            final Plan plan = catalogService.getFullCatalog().findPlan(spec.getProductName(), spec.getBillingPeriod(), realPriceList, requestedDate);
+            final PlanPhase phase = plan.getAllPhases()[0];
             if (phase == null) {
                 throw new EntitlementError(String.format("No initial PlanPhase for Product %s, term %s and set %s does not exist in the catalog",
-                        spec.getProductName(), spec.getBillingPeriod().toString(), realPriceList));
+                                                         spec.getProductName(), spec.getBillingPeriod().toString(), realPriceList));
             }
 
-            DateTime effectiveDate = requestedDate;
-            DateTime processedDate = now;
+            final DateTime effectiveDate = requestedDate;
+            final DateTime processedDate = now;
 
             createFromSubscription(subscription, plan, spec.getPhaseType(), realPriceList, requestedDate, effectiveDate, processedDate, true, context);
             return true;
@@ -115,33 +114,33 @@ public class DefaultSubscriptionApiService implements SubscriptionApiService {
         }
     }
 
-    private void createFromSubscription(SubscriptionData subscription, Plan plan, PhaseType initialPhase,
-            String realPriceList, DateTime requestedDate, DateTime effectiveDate, DateTime processedDate,
-            boolean reCreate, CallContext context)
-    throws EntitlementUserApiException {
+    private void createFromSubscription(final SubscriptionData subscription, final Plan plan, final PhaseType initialPhase,
+                                        final String realPriceList, final DateTime requestedDate, final DateTime effectiveDate, final DateTime processedDate,
+                                        final boolean reCreate, final CallContext context)
+            throws EntitlementUserApiException {
 
 
         try {
-            TimedPhase [] curAndNextPhases = planAligner.getCurrentAndNextTimedPhaseOnCreate(subscription, plan, initialPhase, realPriceList, requestedDate, effectiveDate);
-
-            ApiEventBuilder createBuilder = new ApiEventBuilder()
-            .setSubscriptionId(subscription.getId())
-            .setEventPlan(plan.getName())
-            .setEventPlanPhase(curAndNextPhases[0].getPhase().getName())
-            .setEventPriceList(realPriceList)
-            .setActiveVersion(subscription.getActiveVersion())
-            .setProcessedDate(processedDate)
-            .setEffectiveDate(effectiveDate)
-            .setRequestedDate(requestedDate)
-            .setUserToken(context.getUserToken())            
-            .setFromDisk(true);
-            ApiEvent creationEvent = (reCreate) ? new ApiEventReCreate(createBuilder) : new ApiEventCreate(createBuilder);
-
-            TimedPhase nextTimedPhase = curAndNextPhases[1];
-            PhaseEvent nextPhaseEvent = (nextTimedPhase != null) ?
+            final TimedPhase[] curAndNextPhases = planAligner.getCurrentAndNextTimedPhaseOnCreate(subscription, plan, initialPhase, realPriceList, requestedDate, effectiveDate);
+
+            final ApiEventBuilder createBuilder = new ApiEventBuilder()
+                    .setSubscriptionId(subscription.getId())
+                    .setEventPlan(plan.getName())
+                    .setEventPlanPhase(curAndNextPhases[0].getPhase().getName())
+                    .setEventPriceList(realPriceList)
+                    .setActiveVersion(subscription.getActiveVersion())
+                    .setProcessedDate(processedDate)
+                    .setEffectiveDate(effectiveDate)
+                    .setRequestedDate(requestedDate)
+                    .setUserToken(context.getUserToken())
+                    .setFromDisk(true);
+            final ApiEvent creationEvent = (reCreate) ? new ApiEventReCreate(createBuilder) : new ApiEventCreate(createBuilder);
+
+            final TimedPhase nextTimedPhase = curAndNextPhases[1];
+            final PhaseEvent nextPhaseEvent = (nextTimedPhase != null) ?
                     PhaseEventData.createNextPhaseEvent(nextTimedPhase.getPhase().getName(), subscription, processedDate, nextTimedPhase.getStartPhase()) :
-                        null;
-            List<EntitlementEvent> events = new ArrayList<EntitlementEvent>();
+                    null;
+            final List<EntitlementEvent> events = new ArrayList<EntitlementEvent>();
             events.add(creationEvent);
             if (nextPhaseEvent != null) {
                 events.add(nextPhaseEvent);
@@ -157,37 +156,37 @@ public class DefaultSubscriptionApiService implements SubscriptionApiService {
         }
     }
 
-    public boolean cancel(SubscriptionData subscription, DateTime requestedDate, boolean eot, CallContext context)
-    throws EntitlementUserApiException {
+    public boolean cancel(final SubscriptionData subscription, DateTime requestedDate, final boolean eot, final CallContext context)
+            throws EntitlementUserApiException {
 
         try {
-            SubscriptionState currentState = subscription.getState();
+            final SubscriptionState currentState = subscription.getState();
             if (currentState != SubscriptionState.ACTIVE) {
                 throw new EntitlementUserApiException(ErrorCode.ENT_CANCEL_BAD_STATE, subscription.getId(), currentState);
             }
 
-            DateTime now = clock.getUTCNow();
+            final DateTime now = clock.getUTCNow();
             requestedDate = (requestedDate != null) ? DefaultClock.truncateMs(requestedDate) : now;
             validateRequestedDate(subscription, now, requestedDate);
 
-            Plan currentPlan = subscription.getCurrentPlan();
-            PlanPhaseSpecifier planPhase = new PlanPhaseSpecifier(currentPlan.getProduct().getName(),
-                    currentPlan.getProduct().getCategory(),
-                    subscription.getCurrentPlan().getBillingPeriod(),
-                    subscription.getCurrentPriceList().getName(),
-                    subscription.getCurrentPhase().getPhaseType());
-
-            ActionPolicy policy = catalogService.getFullCatalog().planCancelPolicy(planPhase, requestedDate);
-            DateTime effectiveDate = subscription.getPlanChangeEffectiveDate(policy, requestedDate);
-
-            EntitlementEvent cancelEvent = new ApiEventCancel(new ApiEventBuilder()
-            .setSubscriptionId(subscription.getId())
-            .setActiveVersion(subscription.getActiveVersion())
-            .setProcessedDate(now)
-            .setEffectiveDate(effectiveDate)
-            .setRequestedDate(requestedDate)
-            .setUserToken(context.getUserToken())
-            .setFromDisk(true));
+            final Plan currentPlan = subscription.getCurrentPlan();
+            final PlanPhaseSpecifier planPhase = new PlanPhaseSpecifier(currentPlan.getProduct().getName(),
+                                                                  currentPlan.getProduct().getCategory(),
+                                                                  subscription.getCurrentPlan().getBillingPeriod(),
+                                                                  subscription.getCurrentPriceList().getName(),
+                                                                  subscription.getCurrentPhase().getPhaseType());
+
+            final ActionPolicy policy = catalogService.getFullCatalog().planCancelPolicy(planPhase, requestedDate);
+            final DateTime effectiveDate = subscription.getPlanChangeEffectiveDate(policy, requestedDate);
+
+            final EntitlementEvent cancelEvent = new ApiEventCancel(new ApiEventBuilder()
+                                                                      .setSubscriptionId(subscription.getId())
+                                                                      .setActiveVersion(subscription.getActiveVersion())
+                                                                      .setProcessedDate(now)
+                                                                      .setEffectiveDate(effectiveDate)
+                                                                      .setRequestedDate(requestedDate)
+                                                                      .setUserToken(context.getUserToken())
+                                                                      .setFromDisk(true));
 
             dao.cancelSubscription(subscription.getId(), cancelEvent, context, 0);
             subscription.rebuildTransitions(dao.getEventsForSubscription(subscription.getId()), catalogService.getFullCatalog());
@@ -198,52 +197,52 @@ public class DefaultSubscriptionApiService implements SubscriptionApiService {
     }
 
 
-    public boolean uncancel(SubscriptionData subscription, CallContext context)
-    throws EntitlementUserApiException {
+    public boolean uncancel(final SubscriptionData subscription, final CallContext context)
+            throws EntitlementUserApiException {
 
         if (!subscription.isSubscriptionFutureCancelled()) {
             throw new EntitlementUserApiException(ErrorCode.ENT_UNCANCEL_BAD_STATE, subscription.getId().toString());
         }
 
-        DateTime now = clock.getUTCNow();
-        EntitlementEvent uncancelEvent = new ApiEventUncancel(new ApiEventBuilder()
-        .setSubscriptionId(subscription.getId())
-        .setActiveVersion(subscription.getActiveVersion())
-        .setProcessedDate(now)
-        .setRequestedDate(now)
-        .setEffectiveDate(now)
-        .setUserToken(context.getUserToken())
-        .setFromDisk(true));
-
-        List<EntitlementEvent> uncancelEvents = new ArrayList<EntitlementEvent>();
+        final DateTime now = clock.getUTCNow();
+        final EntitlementEvent uncancelEvent = new ApiEventUncancel(new ApiEventBuilder()
+                                                                      .setSubscriptionId(subscription.getId())
+                                                                      .setActiveVersion(subscription.getActiveVersion())
+                                                                      .setProcessedDate(now)
+                                                                      .setRequestedDate(now)
+                                                                      .setEffectiveDate(now)
+                                                                      .setUserToken(context.getUserToken())
+                                                                      .setFromDisk(true));
+
+        final List<EntitlementEvent> uncancelEvents = new ArrayList<EntitlementEvent>();
         uncancelEvents.add(uncancelEvent);
 
-        TimedPhase nextTimedPhase = planAligner.getNextTimedPhase(subscription, now, now);
-        PhaseEvent nextPhaseEvent = (nextTimedPhase != null) ?
+        final TimedPhase nextTimedPhase = planAligner.getNextTimedPhase(subscription, now, now);
+        final PhaseEvent nextPhaseEvent = (nextTimedPhase != null) ?
                 PhaseEventData.createNextPhaseEvent(nextTimedPhase.getPhase().getName(), subscription, now, nextTimedPhase.getStartPhase()) :
-                    null;
-                if (nextPhaseEvent != null) {
-                    uncancelEvents.add(nextPhaseEvent);
-                }
-                dao.uncancelSubscription(subscription.getId(), uncancelEvents, context);
-                subscription.rebuildTransitions(dao.getEventsForSubscription(subscription.getId()), catalogService.getFullCatalog());
-                return true;
+                null;
+        if (nextPhaseEvent != null) {
+            uncancelEvents.add(nextPhaseEvent);
+        }
+        dao.uncancelSubscription(subscription.getId(), uncancelEvents, context);
+        subscription.rebuildTransitions(dao.getEventsForSubscription(subscription.getId()), catalogService.getFullCatalog());
+        return true;
     }
-    
-    public boolean changePlan(SubscriptionData subscription, String productName, BillingPeriod term,
-            String priceList, DateTime requestedDate, CallContext context)
 
-    throws EntitlementUserApiException {
+    public boolean changePlan(final SubscriptionData subscription, final String productName, final BillingPeriod term,
+                              final String priceList, DateTime requestedDate, final CallContext context)
+
+            throws EntitlementUserApiException {
 
         try {
 
-            DateTime now = clock.getUTCNow();
+            final DateTime now = clock.getUTCNow();
             requestedDate = (requestedDate != null) ? DefaultClock.truncateMs(requestedDate) : now;
             validateRequestedDate(subscription, now, requestedDate);
 
-            PriceList currentPriceList = subscription.getCurrentPriceList();
+            final PriceList currentPriceList = subscription.getCurrentPriceList();
 
-            SubscriptionState currentState = subscription.getState();
+            final SubscriptionState currentState = subscription.getState();
             if (currentState != SubscriptionState.ACTIVE) {
                 throw new EntitlementUserApiException(ErrorCode.ENT_CHANGE_NON_ACTIVE, subscription.getId(), currentState);
             }
@@ -254,49 +253,49 @@ public class DefaultSubscriptionApiService implements SubscriptionApiService {
             PlanChangeResult planChangeResult = null;
             try {
 
-                Product destProduct = catalogService.getFullCatalog().findProduct(productName, requestedDate);
-                Plan currentPlan = subscription.getCurrentPlan();
-                PlanPhaseSpecifier fromPlanPhase = new PlanPhaseSpecifier(currentPlan.getProduct().getName(),
-                        currentPlan.getProduct().getCategory(),
-                        currentPlan.getBillingPeriod(),
-                        currentPriceList.getName(), subscription.getCurrentPhase().getPhaseType());
-                PlanSpecifier toPlanPhase = new PlanSpecifier(productName,
-                        destProduct.getCategory(),
-                        term,
-                        priceList);
+                final Product destProduct = catalogService.getFullCatalog().findProduct(productName, requestedDate);
+                final Plan currentPlan = subscription.getCurrentPlan();
+                final PlanPhaseSpecifier fromPlanPhase = new PlanPhaseSpecifier(currentPlan.getProduct().getName(),
+                                                                          currentPlan.getProduct().getCategory(),
+                                                                          currentPlan.getBillingPeriod(),
+                                                                          currentPriceList.getName(), subscription.getCurrentPhase().getPhaseType());
+                final PlanSpecifier toPlanPhase = new PlanSpecifier(productName,
+                                                              destProduct.getCategory(),
+                                                              term,
+                                                              priceList);
 
                 planChangeResult = catalogService.getFullCatalog().planChange(fromPlanPhase, toPlanPhase, requestedDate);
             } catch (CatalogApiException e) {
                 throw new EntitlementUserApiException(e);
             }
 
-            ActionPolicy policy = planChangeResult.getPolicy();
-            PriceList newPriceList = planChangeResult.getNewPriceList();
+            final ActionPolicy policy = planChangeResult.getPolicy();
+            final PriceList newPriceList = planChangeResult.getNewPriceList();
 
-            Plan newPlan = catalogService.getFullCatalog().findPlan(productName, term, newPriceList.getName(), requestedDate, subscription.getStartDate());
-            DateTime effectiveDate = subscription.getPlanChangeEffectiveDate(policy, requestedDate);
+            final Plan newPlan = catalogService.getFullCatalog().findPlan(productName, term, newPriceList.getName(), requestedDate, subscription.getStartDate());
+            final DateTime effectiveDate = subscription.getPlanChangeEffectiveDate(policy, requestedDate);
 
-            TimedPhase currentTimedPhase = planAligner.getCurrentTimedPhaseOnChange(subscription, newPlan, newPriceList.getName(), requestedDate, effectiveDate);
+            final TimedPhase currentTimedPhase = planAligner.getCurrentTimedPhaseOnChange(subscription, newPlan, newPriceList.getName(), requestedDate, effectiveDate);
 
-            EntitlementEvent changeEvent = new ApiEventChange(new ApiEventBuilder()
-            .setSubscriptionId(subscription.getId())
-            .setEventPlan(newPlan.getName())
-            .setEventPlanPhase(currentTimedPhase.getPhase().getName())
-            .setEventPriceList(newPriceList.getName())
-            .setActiveVersion(subscription.getActiveVersion())
-            .setProcessedDate(now)
-            .setEffectiveDate(effectiveDate)
-            .setRequestedDate(requestedDate)
-            .setUserToken(context.getUserToken())            
-            .setFromDisk(true));
+            final EntitlementEvent changeEvent = new ApiEventChange(new ApiEventBuilder()
+                                                                      .setSubscriptionId(subscription.getId())
+                                                                      .setEventPlan(newPlan.getName())
+                                                                      .setEventPlanPhase(currentTimedPhase.getPhase().getName())
+                                                                      .setEventPriceList(newPriceList.getName())
+                                                                      .setActiveVersion(subscription.getActiveVersion())
+                                                                      .setProcessedDate(now)
+                                                                      .setEffectiveDate(effectiveDate)
+                                                                      .setRequestedDate(requestedDate)
+                                                                      .setUserToken(context.getUserToken())
+                                                                      .setFromDisk(true));
 
-            TimedPhase nextTimedPhase = planAligner.getNextTimedPhaseOnChange(subscription, newPlan, newPriceList.getName(), requestedDate, effectiveDate);
-            PhaseEvent nextPhaseEvent = (nextTimedPhase != null) ?
+            final TimedPhase nextTimedPhase = planAligner.getNextTimedPhaseOnChange(subscription, newPlan, newPriceList.getName(), requestedDate, effectiveDate);
+            final PhaseEvent nextPhaseEvent = (nextTimedPhase != null) ?
                     PhaseEventData.createNextPhaseEvent(nextTimedPhase.getPhase().getName(), subscription, now, nextTimedPhase.getStartPhase()) :
-                        null;
-            List<EntitlementEvent> changeEvents = new ArrayList<EntitlementEvent>();
+                    null;
+            final List<EntitlementEvent> changeEvents = new ArrayList<EntitlementEvent>();
             // Only add the PHASE if it does not coincide with the CHANGE, if not this is 'just' a CHANGE.
-            if (nextPhaseEvent != null && ! nextPhaseEvent.getEffectiveDate().equals(changeEvent.getEffectiveDate())) {
+            if (nextPhaseEvent != null && !nextPhaseEvent.getEffectiveDate().equals(changeEvent.getEffectiveDate())) {
                 changeEvents.add(nextPhaseEvent);
             }
             changeEvents.add(changeEvent);
@@ -308,19 +307,19 @@ public class DefaultSubscriptionApiService implements SubscriptionApiService {
         }
     }
 
-    private void validateRequestedDate(SubscriptionData subscription, DateTime now, DateTime requestedDate)
-        throws EntitlementUserApiException {
+    private void validateRequestedDate(final SubscriptionData subscription, final DateTime now, final DateTime requestedDate)
+            throws EntitlementUserApiException {
 
-        if (requestedDate.isAfter(now) ) {
+        if (requestedDate.isAfter(now)) {
             throw new EntitlementUserApiException(ErrorCode.ENT_INVALID_REQUESTED_FUTURE_DATE, requestedDate.toString());
         }
 
-        SubscriptionEvent previousTransition = subscription.getPreviousTransition();
+        final SubscriptionEvent previousTransition = subscription.getPreviousTransition();
         if (previousTransition != null && previousTransition.getEffectiveTransitionTime().isAfter(requestedDate)) {
             throw new EntitlementUserApiException(ErrorCode.ENT_INVALID_REQUESTED_DATE,
-                    requestedDate.toString(), previousTransition.getEffectiveTransitionTime());
+                                                  requestedDate.toString(), previousTransition.getEffectiveTransitionTime());
         }
     }
-    
+
 
 }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultSubscriptionEvent.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultSubscriptionEvent.java
index 333cc4e..f28ddb7 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultSubscriptionEvent.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultSubscriptionEvent.java
@@ -17,11 +17,11 @@ package com.ning.billing.entitlement.api.user;
 
 import java.util.UUID;
 
+import org.joda.time.DateTime;
+
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.joda.time.DateTime;
-
 import com.ning.billing.entitlement.api.SubscriptionTransitionType;
 import com.ning.billing.entitlement.api.user.Subscription.SubscriptionState;
 
@@ -46,47 +46,47 @@ public class DefaultSubscriptionEvent implements SubscriptionEvent {
     private final SubscriptionTransitionType transitionType;
 
     private final DateTime startDate;
-    
+
     public DefaultSubscriptionEvent(final SubscriptionTransitionData in, final DateTime startDate) {
         this(in.getId(),
-                in.getSubscriptionId(),
-                in.getBundleId(),
-                in.getRequestedTransitionTime(),
-                in.getEffectiveTransitionTime(),
-                in.getPreviousState(),
-                (in.getPreviousPlan() != null ) ? in.getPreviousPlan().getName() : null,
-                (in.getPreviousPhase() != null) ? in.getPreviousPhase().getName() : null,
-                (in.getPreviousPriceList() != null) ? in.getPreviousPriceList().getName() : null,
-                in.getNextState(),
-                (in.getNextPlan() != null) ? in.getNextPlan().getName() : null,
-                (in.getNextPhase() != null) ? in.getNextPhase().getName() : null,
-                (in.getNextPriceList() != null) ? in.getNextPriceList().getName() : null,
-                in.getTotalOrdering(),
-                in.getUserToken(),
-                in.getTransitionType(),
-                in.getRemainingEventsForUserOperation(),
-                startDate);
+             in.getSubscriptionId(),
+             in.getBundleId(),
+             in.getRequestedTransitionTime(),
+             in.getEffectiveTransitionTime(),
+             in.getPreviousState(),
+             (in.getPreviousPlan() != null) ? in.getPreviousPlan().getName() : null,
+             (in.getPreviousPhase() != null) ? in.getPreviousPhase().getName() : null,
+             (in.getPreviousPriceList() != null) ? in.getPreviousPriceList().getName() : null,
+             in.getNextState(),
+             (in.getNextPlan() != null) ? in.getNextPlan().getName() : null,
+             (in.getNextPhase() != null) ? in.getNextPhase().getName() : null,
+             (in.getNextPriceList() != null) ? in.getNextPriceList().getName() : null,
+             in.getTotalOrdering(),
+             in.getUserToken(),
+             in.getTransitionType(),
+             in.getRemainingEventsForUserOperation(),
+             startDate);
     }
-    
+
     @JsonCreator
-    public DefaultSubscriptionEvent(@JsonProperty("eventId") UUID eventId,
-            @JsonProperty("subscriptionId") UUID subscriptionId,
-            @JsonProperty("bundleId") UUID bundleId,
-            @JsonProperty("requestedTransitionTime") DateTime requestedTransitionTime,
-            @JsonProperty("effectiveTransitionTime") DateTime effectiveTransitionTime,
-            @JsonProperty("previousState") SubscriptionState previousState,
-            @JsonProperty("previousPlan") String previousPlan,
-            @JsonProperty("previousPhase") String previousPhase,
-            @JsonProperty("previousPriceList") String previousPriceList,
-            @JsonProperty("nextState") SubscriptionState nextState,
-            @JsonProperty("nextPlan") String nextPlan,
-            @JsonProperty("nextPhase") String nextPhase,
-            @JsonProperty("nextPriceList") String nextPriceList,
-            @JsonProperty("totalOrdering") Long totalOrdering,
-            @JsonProperty("userToken") UUID userToken,
-            @JsonProperty("transitionType") SubscriptionTransitionType transitionType,
-            @JsonProperty("remainingEventsForUserOperation") Integer remainingEventsForUserOperation,
-            @JsonProperty("startDate") DateTime startDate) {
+    public DefaultSubscriptionEvent(@JsonProperty("eventId") final UUID eventId,
+                                    @JsonProperty("subscriptionId") final UUID subscriptionId,
+                                    @JsonProperty("bundleId") final UUID bundleId,
+                                    @JsonProperty("requestedTransitionTime") final DateTime requestedTransitionTime,
+                                    @JsonProperty("effectiveTransitionTime") final DateTime effectiveTransitionTime,
+                                    @JsonProperty("previousState") final SubscriptionState previousState,
+                                    @JsonProperty("previousPlan") final String previousPlan,
+                                    @JsonProperty("previousPhase") final String previousPhase,
+                                    @JsonProperty("previousPriceList") final String previousPriceList,
+                                    @JsonProperty("nextState") final SubscriptionState nextState,
+                                    @JsonProperty("nextPlan") final String nextPlan,
+                                    @JsonProperty("nextPhase") final String nextPhase,
+                                    @JsonProperty("nextPriceList") final String nextPriceList,
+                                    @JsonProperty("totalOrdering") final Long totalOrdering,
+                                    @JsonProperty("userToken") final UUID userToken,
+                                    @JsonProperty("transitionType") final SubscriptionTransitionType transitionType,
+                                    @JsonProperty("remainingEventsForUserOperation") final Integer remainingEventsForUserOperation,
+                                    @JsonProperty("startDate") final DateTime startDate) {
         super();
         this.eventId = eventId;
         this.subscriptionId = subscriptionId;
@@ -107,7 +107,7 @@ public class DefaultSubscriptionEvent implements SubscriptionEvent {
         this.remainingEventsForUserOperation = remainingEventsForUserOperation;
         this.startDate = startDate;
     }
-    
+
     @JsonIgnore
     @Override
     public BusEventType getBusEventType() {
@@ -171,12 +171,12 @@ public class DefaultSubscriptionEvent implements SubscriptionEvent {
     public String getNextPriceList() {
         return nextPriceList;
     }
-    
+
     @Override
     public UUID getUserToken() {
         return userToken;
     }
-    
+
     @Override
     public Integer getRemainingEventsForUserOperation() {
         return remainingEventsForUserOperation;
@@ -202,7 +202,7 @@ public class DefaultSubscriptionEvent implements SubscriptionEvent {
     public SubscriptionTransitionType getTransitionType() {
         return transitionType;
     }
-    
+
     @JsonProperty("startDate")
     @Override
     public DateTime getSubscriptionStartDate() {
@@ -219,7 +219,7 @@ public class DefaultSubscriptionEvent implements SubscriptionEvent {
         result = prime
                 * result
                 + ((effectiveTransitionTime == null) ? 0
-                        : effectiveTransitionTime.hashCode());
+                : effectiveTransitionTime.hashCode());
         result = prime * result + ((eventId == null) ? 0 : eventId.hashCode());
         result = prime * result
                 + ((nextPhase == null) ? 0 : nextPhase.hashCode());
@@ -236,17 +236,17 @@ public class DefaultSubscriptionEvent implements SubscriptionEvent {
         result = prime
                 * result
                 + ((previousPriceList == null) ? 0 : previousPriceList
-                        .hashCode());
+                .hashCode());
         result = prime * result
                 + ((previousState == null) ? 0 : previousState.hashCode());
         result = prime
                 * result
                 + ((remainingEventsForUserOperation == null) ? 0
-                        : remainingEventsForUserOperation.hashCode());
+                : remainingEventsForUserOperation.hashCode());
         result = prime
                 * result
                 + ((requestedTransitionTime == null) ? 0
-                        : requestedTransitionTime.hashCode());
+                : requestedTransitionTime.hashCode());
         result = prime * result
                 + ((subscriptionId == null) ? 0 : subscriptionId.hashCode());
         result = prime * result
@@ -259,100 +259,134 @@ public class DefaultSubscriptionEvent implements SubscriptionEvent {
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
+    public boolean equals(final Object obj) {
+        if (this == obj) {
             return true;
-        if (obj == null)
+        }
+        if (obj == null) {
             return false;
-        if (getClass() != obj.getClass())
+        }
+        if (getClass() != obj.getClass()) {
             return false;
-        DefaultSubscriptionEvent other = (DefaultSubscriptionEvent) obj;
+        }
+        final DefaultSubscriptionEvent other = (DefaultSubscriptionEvent) obj;
         if (bundleId == null) {
-            if (other.bundleId != null)
+            if (other.bundleId != null) {
                 return false;
-        } else if (!bundleId.equals(other.bundleId))
+            }
+        } else if (!bundleId.equals(other.bundleId)) {
             return false;
+        }
         if (effectiveTransitionTime == null) {
-            if (other.effectiveTransitionTime != null)
+            if (other.effectiveTransitionTime != null) {
                 return false;
+            }
         } else if (effectiveTransitionTime
-                .compareTo(other.effectiveTransitionTime) != 0)
+                .compareTo(other.effectiveTransitionTime) != 0) {
             return false;
+        }
         if (eventId == null) {
-            if (other.eventId != null)
+            if (other.eventId != null) {
                 return false;
-        } else if (!eventId.equals(other.eventId))
+            }
+        } else if (!eventId.equals(other.eventId)) {
             return false;
+        }
         if (nextPhase == null) {
-            if (other.nextPhase != null)
+            if (other.nextPhase != null) {
                 return false;
-        } else if (!nextPhase.equals(other.nextPhase))
+            }
+        } else if (!nextPhase.equals(other.nextPhase)) {
             return false;
+        }
         if (nextPlan == null) {
-            if (other.nextPlan != null)
+            if (other.nextPlan != null) {
                 return false;
-        } else if (!nextPlan.equals(other.nextPlan))
+            }
+        } else if (!nextPlan.equals(other.nextPlan)) {
             return false;
+        }
         if (nextPriceList == null) {
-            if (other.nextPriceList != null)
+            if (other.nextPriceList != null) {
                 return false;
-        } else if (!nextPriceList.equals(other.nextPriceList))
+            }
+        } else if (!nextPriceList.equals(other.nextPriceList)) {
             return false;
-        if (nextState != other.nextState)
+        }
+        if (nextState != other.nextState) {
             return false;
+        }
         if (previousPhase == null) {
-            if (other.previousPhase != null)
+            if (other.previousPhase != null) {
                 return false;
-        } else if (!previousPhase.equals(other.previousPhase))
+            }
+        } else if (!previousPhase.equals(other.previousPhase)) {
             return false;
+        }
         if (previousPlan == null) {
-            if (other.previousPlan != null)
+            if (other.previousPlan != null) {
                 return false;
-        } else if (!previousPlan.equals(other.previousPlan))
+            }
+        } else if (!previousPlan.equals(other.previousPlan)) {
             return false;
+        }
         if (previousPriceList == null) {
-            if (other.previousPriceList != null)
+            if (other.previousPriceList != null) {
                 return false;
-        } else if (!previousPriceList.equals(other.previousPriceList))
+            }
+        } else if (!previousPriceList.equals(other.previousPriceList)) {
             return false;
-        if (previousState != other.previousState)
+        }
+        if (previousState != other.previousState) {
             return false;
+        }
         if (remainingEventsForUserOperation == null) {
-            if (other.remainingEventsForUserOperation != null)
+            if (other.remainingEventsForUserOperation != null) {
                 return false;
+            }
         } else if (!remainingEventsForUserOperation
-                .equals(other.remainingEventsForUserOperation))
+                .equals(other.remainingEventsForUserOperation)) {
             return false;
+        }
         if (requestedTransitionTime == null) {
-            if (other.requestedTransitionTime != null)
+            if (other.requestedTransitionTime != null) {
                 return false;
+            }
         } else if (requestedTransitionTime
-                .compareTo(other.requestedTransitionTime) != 0)
+                .compareTo(other.requestedTransitionTime) != 0) {
             return false;
+        }
         if (subscriptionId == null) {
-            if (other.subscriptionId != null)
+            if (other.subscriptionId != null) {
                 return false;
-        } else if (!subscriptionId.equals(other.subscriptionId))
+            }
+        } else if (!subscriptionId.equals(other.subscriptionId)) {
             return false;
+        }
         if (totalOrdering == null) {
-            if (other.totalOrdering != null)
+            if (other.totalOrdering != null) {
                 return false;
-        } else if (!totalOrdering.equals(other.totalOrdering))
+            }
+        } else if (!totalOrdering.equals(other.totalOrdering)) {
             return false;
-        if (transitionType != other.transitionType)
+        }
+        if (transitionType != other.transitionType) {
             return false;
+        }
         if (userToken == null) {
-            if (other.userToken != null)
+            if (other.userToken != null) {
                 return false;
-        } else if (!userToken.equals(other.userToken))
+            }
+        } else if (!userToken.equals(other.userToken)) {
             return false;
+        }
         return true;
     }
 
     @Override
     public String toString() {
         return "DefaultSubscriptionEvent [transitionType=" + transitionType
-                + ", effectiveTransitionTime=" + effectiveTransitionTime        
+                + ", effectiveTransitionTime=" + effectiveTransitionTime
                 + ", totalOrdering=" + totalOrdering
                 + ", subscriptionId=" + subscriptionId + ", bundleId="
                 + bundleId + ", eventId=" + eventId
@@ -365,7 +399,7 @@ public class DefaultSubscriptionEvent implements SubscriptionEvent {
                 + ", remainingEventsForUserOperation="
                 + remainingEventsForUserOperation + ", userToken=" + userToken
                 + ", startDate=" + startDate + "]";
-                
+
     }
-    
+
 }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultSubscriptionFactory.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultSubscriptionFactory.java
index 37a94f6..bb2188f 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultSubscriptionFactory.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultSubscriptionFactory.java
@@ -16,6 +16,12 @@
 
 package com.ning.billing.entitlement.api.user;
 
+import java.lang.reflect.Field;
+import java.util.List;
+import java.util.UUID;
+
+import org.joda.time.DateTime;
+
 import com.google.inject.Inject;
 import com.ning.billing.catalog.api.CatalogService;
 import com.ning.billing.catalog.api.ProductCategory;
@@ -24,11 +30,6 @@ import com.ning.billing.entitlement.api.SubscriptionFactory;
 import com.ning.billing.entitlement.events.EntitlementEvent;
 import com.ning.billing.entitlement.exceptions.EntitlementError;
 import com.ning.billing.util.clock.Clock;
-import org.joda.time.DateTime;
-
-import java.lang.reflect.Field;
-import java.util.List;
-import java.util.UUID;
 
 public class DefaultSubscriptionFactory implements SubscriptionFactory {
 
@@ -37,15 +38,15 @@ public class DefaultSubscriptionFactory implements SubscriptionFactory {
     protected final CatalogService catalogService;
 
     @Inject
-    public DefaultSubscriptionFactory(SubscriptionApiService apiService, Clock clock, CatalogService catalogService) {
+    public DefaultSubscriptionFactory(final SubscriptionApiService apiService, final Clock clock, final CatalogService catalogService) {
         this.apiService = apiService;
         this.clock = clock;
         this.catalogService = catalogService;
     }
 
 
-    public SubscriptionData createSubscription(SubscriptionBuilder builder, List<EntitlementEvent> events) {
-        SubscriptionData subscription = new SubscriptionData(builder, apiService, clock);
+    public SubscriptionData createSubscription(final SubscriptionBuilder builder, final List<EntitlementEvent> events) {
+        final SubscriptionData subscription = new SubscriptionData(builder, apiService, clock);
         if (events.size() > 0) {
             subscription.rebuildTransitions(events, catalogService.getFullCatalog());
         }
@@ -55,20 +56,20 @@ public class DefaultSubscriptionFactory implements SubscriptionFactory {
 
     public static class SubscriptionBuilder {
 
-        private  UUID id;
-        private  UUID bundleId;
-        private  DateTime startDate;
-        private  DateTime bundleStartDate;
-        private  Long activeVersion;
-        private  ProductCategory category;
-        private  DateTime chargedThroughDate;
-        private  DateTime paidThroughDate;
+        private UUID id;
+        private UUID bundleId;
+        private DateTime startDate;
+        private DateTime bundleStartDate;
+        private Long activeVersion;
+        private ProductCategory category;
+        private DateTime chargedThroughDate;
+        private DateTime paidThroughDate;
 
         public SubscriptionBuilder() {
             this.activeVersion = SubscriptionEvents.INITIAL_VERSION;
         }
 
-        public SubscriptionBuilder(SubscriptionData original) {
+        public SubscriptionBuilder(final SubscriptionData original) {
             this.id = original.getId();
             this.bundleId = original.getBundleId();
             this.startDate = original.getStartDate();
@@ -80,35 +81,42 @@ public class DefaultSubscriptionFactory implements SubscriptionFactory {
         }
 
 
-        public SubscriptionBuilder setId(UUID id) {
+        public SubscriptionBuilder setId(final UUID id) {
             this.id = id;
             return this;
         }
-        public SubscriptionBuilder setBundleId(UUID bundleId) {
+
+        public SubscriptionBuilder setBundleId(final UUID bundleId) {
             this.bundleId = bundleId;
             return this;
         }
-        public SubscriptionBuilder setStartDate(DateTime startDate) {
+
+        public SubscriptionBuilder setStartDate(final DateTime startDate) {
             this.startDate = startDate;
             return this;
         }
-        public SubscriptionBuilder setBundleStartDate(DateTime bundleStartDate) {
+
+        public SubscriptionBuilder setBundleStartDate(final DateTime bundleStartDate) {
             this.bundleStartDate = bundleStartDate;
             return this;
         }
-        public SubscriptionBuilder setActiveVersion(long activeVersion) {
+
+        public SubscriptionBuilder setActiveVersion(final long activeVersion) {
             this.activeVersion = activeVersion;
             return this;
         }
-        public SubscriptionBuilder setChargedThroughDate(DateTime chargedThroughDate) {
+
+        public SubscriptionBuilder setChargedThroughDate(final DateTime chargedThroughDate) {
             this.chargedThroughDate = chargedThroughDate;
             return this;
         }
-        public SubscriptionBuilder setPaidThroughDate(DateTime paidThroughDate) {
+
+        public SubscriptionBuilder setPaidThroughDate(final DateTime paidThroughDate) {
             this.paidThroughDate = paidThroughDate;
             return this;
         }
-        public SubscriptionBuilder setCategory(ProductCategory category) {
+
+        public SubscriptionBuilder setCategory(final ProductCategory category) {
             this.category = category;
             return this;
         }
@@ -116,38 +124,46 @@ public class DefaultSubscriptionFactory implements SubscriptionFactory {
         public UUID getId() {
             return id;
         }
+
         public UUID getBundleId() {
             return bundleId;
         }
+
         public DateTime getStartDate() {
             return startDate;
         }
+
         public DateTime getBundleStartDate() {
             return bundleStartDate;
         }
+
         public Long getActiveVersion() {
             return activeVersion;
         }
+
         public ProductCategory getCategory() {
             return category;
         }
+
         public DateTime getChargedThroughDate() {
             return chargedThroughDate;
         }
+
         public DateTime getPaidThroughDate() {
             return paidThroughDate;
         }
+
         private void checkAllFieldsSet() {
-            for (Field cur : SubscriptionBuilder.class.getDeclaredFields()) {
+            for (final Field cur : SubscriptionBuilder.class.getDeclaredFields()) {
                 try {
-                    Object value = cur.get(this);
+                    final Object value = cur.get(this);
                     if (value == null) {
                         throw new EntitlementError(String.format("Field %s has not been set for Subscription",
-                                cur.getName()));
+                                                                 cur.getName()));
                     }
                 } catch (IllegalAccessException e) {
                     throw new EntitlementError(String.format("Failed to access value for field %s for Subscription",
-                            cur.getName()), e);
+                                                             cur.getName()), e);
                 }
             }
         }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultSubscriptionStatusDryRun.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultSubscriptionStatusDryRun.java
index 9971f41..3cdc83f 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultSubscriptionStatusDryRun.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultSubscriptionStatusDryRun.java
@@ -21,18 +21,18 @@ import com.ning.billing.catalog.api.BillingPeriod;
 import com.ning.billing.catalog.api.PhaseType;
 
 public class DefaultSubscriptionStatusDryRun implements SubscriptionStatusDryRun {
-        
+
     private final UUID id;
     private final String productName;
     private final PhaseType phaseType;
     private final BillingPeriod billingPeriod;
     private final String priceList;
     private final DryRunChangeReason reason;
-    
-    
+
+
     public DefaultSubscriptionStatusDryRun(final UUID id, final String productName,
-            final PhaseType phaseType, final BillingPeriod billingPeriod, final String priceList,
-            final DryRunChangeReason reason) {
+                                           final PhaseType phaseType, final BillingPeriod billingPeriod, final String priceList,
+                                           final DryRunChangeReason reason) {
         super();
         this.id = id;
         this.productName = productName;
@@ -57,7 +57,7 @@ public class DefaultSubscriptionStatusDryRun implements SubscriptionStatusDryRun
         return phaseType;
     }
 
-    
+
     @Override
     public BillingPeriod getBillingPeriod() {
         return billingPeriod;

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionBundleData.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionBundleData.java
index 4da1fe0..be076ba 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionBundleData.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionBundleData.java
@@ -29,18 +29,18 @@ public class SubscriptionBundleData implements SubscriptionBundle {
     private final String key;
     private final UUID accountId;
     private final DateTime startDate;
-    private final DateTime lastSysTimeUpdate; 
+    private final DateTime lastSysTimeUpdate;
     private final OverdueState<SubscriptionBundle> overdueState;
-    
-    public SubscriptionBundleData(String name, UUID accountId, DateTime startDate) {
+
+    public SubscriptionBundleData(final String name, final UUID accountId, final DateTime startDate) {
         this(UUID.randomUUID(), name, accountId, startDate, startDate);
     }
 
-    public SubscriptionBundleData(UUID id, String key, UUID accountId, DateTime startDate, DateTime lastSysUpdate) {
+    public SubscriptionBundleData(final UUID id, final String key, final UUID accountId, final DateTime startDate, final DateTime lastSysUpdate) {
         this(id, key, accountId, startDate, lastSysUpdate, null);
     }
 
-    public SubscriptionBundleData(UUID id, String key, UUID accountId, DateTime startDate, DateTime lastSysUpdate, OverdueState<SubscriptionBundle> overdueState) {
+    public SubscriptionBundleData(final UUID id, final String key, final UUID accountId, final DateTime startDate, final DateTime lastSysUpdate, final OverdueState<SubscriptionBundle> overdueState) {
         super();
         this.id = id;
         this.key = key;
@@ -70,11 +70,11 @@ public class SubscriptionBundleData implements SubscriptionBundle {
     public DateTime getStartDate() {
         return startDate;
     }
-    
+
     public DateTime getLastSysUpdateTime() {
         return lastSysTimeUpdate;
     }
-    
+
     @Override
     public OverdueState<SubscriptionBundle> getOverdueState() {
         return overdueState;

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionData.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionData.java
index b03ea32..e162011 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionData.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionData.java
@@ -16,14 +16,13 @@
 
 package com.ning.billing.entitlement.api.user;
 
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.UUID;
 
-import javax.annotation.Nullable;
-
 import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -56,7 +55,7 @@ import com.ning.billing.util.entity.EntityBase;
 
 public class SubscriptionData extends EntityBase implements Subscription {
 
-    private final static Logger log = LoggerFactory.getLogger(SubscriptionData.class);
+    private static final Logger log = LoggerFactory.getLogger(SubscriptionData.class);
 
 
     protected final Clock clock;
@@ -77,7 +76,7 @@ public class SubscriptionData extends EntityBase implements Subscription {
     protected final DateTime chargedThroughDate;
     protected final DateTime paidThroughDate;
 
-    
+
     //
     // User APIs (create, change, cancel,...) will recompute those each time,
     // so the user holding that subscription object get the correct state when
@@ -86,12 +85,12 @@ public class SubscriptionData extends EntityBase implements Subscription {
     protected LinkedList<SubscriptionTransitionData> transitions;
 
     // Transient object never returned at the API
-    public SubscriptionData(SubscriptionBuilder builder) {
+    public SubscriptionData(final SubscriptionBuilder builder) {
         this(builder, null, null);
     }
 
-    public SubscriptionData(SubscriptionBuilder builder,
-            @Nullable SubscriptionApiService apiService, @Nullable Clock clock) {
+    public SubscriptionData(final SubscriptionBuilder builder,
+                            @Nullable final SubscriptionApiService apiService, @Nullable final Clock clock) {
         super(builder.getId());
         this.apiService = apiService;
         this.clock = clock;
@@ -135,13 +134,13 @@ public class SubscriptionData extends EntityBase implements Subscription {
     @Override
     public PriceList getCurrentPriceList() {
         return (getPreviousTransitionData() == null) ? null :
-            getPreviousTransitionData().getNextPriceList();
+                getPreviousTransitionData().getNextPriceList();
 
     }
 
     @Override
     public DateTime getEndDate() {
-        SubscriptionEvent latestTransition = getPreviousTransition();
+        final SubscriptionEvent latestTransition = getPreviousTransition();
         if (latestTransition.getNextState() == SubscriptionState.CANCELLED) {
             return latestTransition.getEffectiveTransitionTime();
         }
@@ -149,40 +148,40 @@ public class SubscriptionData extends EntityBase implements Subscription {
     }
 
     @Override
-    public boolean cancel(DateTime requestedDate, boolean eot,
-            CallContext context) throws EntitlementUserApiException {
+    public boolean cancel(final DateTime requestedDate, final boolean eot,
+                          final CallContext context) throws EntitlementUserApiException {
         return apiService.cancel(this, requestedDate, eot, context);
     }
 
     @Override
-    public boolean uncancel(CallContext context)
+    public boolean uncancel(final CallContext context)
             throws EntitlementUserApiException {
         return apiService.uncancel(this, context);
     }
 
     @Override
-    public boolean changePlan(String productName, BillingPeriod term,
-            String priceList, DateTime requestedDate, CallContext context)
+    public boolean changePlan(final String productName, final BillingPeriod term,
+                              final String priceList, final DateTime requestedDate, final CallContext context)
             throws EntitlementUserApiException {
         return apiService.changePlan(this, productName, term, priceList,
-                requestedDate, context);
+                                     requestedDate, context);
     }
 
     @Override
-    public boolean recreate(PlanPhaseSpecifier spec, DateTime requestedDate,
-            CallContext context) throws EntitlementUserApiException {
+    public boolean recreate(final PlanPhaseSpecifier spec, final DateTime requestedDate,
+                            final CallContext context) throws EntitlementUserApiException {
         return apiService.recreatePlan(this, spec, requestedDate, context);
     }
 
     @Override
     public SubscriptionEvent getPendingTransition() {
-        SubscriptionTransitionData data = getPendingTransitionData();
+        final SubscriptionTransitionData data = getPendingTransitionData();
         if (data == null) {
             return null;
         }
         return new DefaultSubscriptionEvent(data, startDate);
     }
-    
+
     @Override
     public BlockingState getBlockingState() {
         throw new UnsupportedOperationException();
@@ -192,15 +191,15 @@ public class SubscriptionData extends EntityBase implements Subscription {
         if (transitions == null) {
             return null;
         }
-        SubscriptionTransitionDataIterator it = new SubscriptionTransitionDataIterator(
+        final SubscriptionTransitionDataIterator it = new SubscriptionTransitionDataIterator(
                 clock, transitions, Order.ASC_FROM_PAST, Kind.ENTITLEMENT,
                 Visibility.ALL, TimeLimit.FUTURE_ONLY);
         return it.hasNext() ? it.next() : null;
     }
-    
+
     @Override
     public SubscriptionEvent getPreviousTransition() {
-        SubscriptionTransitionData data = getPreviousTransitionData();
+        final SubscriptionTransitionData data = getPreviousTransitionData();
         if (data == null) {
             return null;
         }
@@ -211,7 +210,7 @@ public class SubscriptionData extends EntityBase implements Subscription {
         if (transitions == null) {
             return null;
         }
-        SubscriptionTransitionDataIterator it = new SubscriptionTransitionDataIterator(
+        final SubscriptionTransitionDataIterator it = new SubscriptionTransitionDataIterator(
                 clock, transitions, Order.DESC_FROM_FUTURE, Kind.ENTITLEMENT,
                 Visibility.FROM_DISK_ONLY, TimeLimit.PAST_OR_PRESENT_ONLY);
         return it.hasNext() ? it.next() : null;
@@ -246,19 +245,24 @@ public class SubscriptionData extends EntityBase implements Subscription {
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
+    public boolean equals(final Object obj) {
+        if (this == obj) {
             return true;
-        if (obj == null)
+        }
+        if (obj == null) {
             return false;
-        if (getClass() != obj.getClass())
+        }
+        if (getClass() != obj.getClass()) {
             return false;
-        SubscriptionData other = (SubscriptionData) obj;
+        }
+        final SubscriptionData other = (SubscriptionData) obj;
         if (id == null) {
-            if (other.id != null)
+            if (other.id != null) {
                 return false;
-        } else if (!id.equals(other.id))
+            }
+        } else if (!id.equals(other.id)) {
             return false;
+        }
         return true;
     }
 
@@ -267,8 +271,8 @@ public class SubscriptionData extends EntityBase implements Subscription {
         if (transitions == null) {
             return Collections.emptyList();
         }
-        List<SubscriptionEvent> result = new ArrayList<SubscriptionEvent>();
-        SubscriptionTransitionDataIterator it = new SubscriptionTransitionDataIterator(
+        final List<SubscriptionEvent> result = new ArrayList<SubscriptionEvent>();
+        final SubscriptionTransitionDataIterator it = new SubscriptionTransitionDataIterator(
                 clock, transitions, Order.ASC_FROM_PAST, Kind.BILLING,
                 Visibility.ALL, TimeLimit.ALL);
         while (it.hasNext()) {
@@ -282,9 +286,9 @@ public class SubscriptionData extends EntityBase implements Subscription {
         if (transitions == null || event == null) {
             return null;
         }
-        for (SubscriptionTransitionData  cur : transitions) {
+        for (final SubscriptionTransitionData cur : transitions) {
             if (cur.getId().equals(event.getId())) {
-                SubscriptionTransitionData withSeq = new SubscriptionTransitionData(cur, seqId);
+                final SubscriptionTransitionData withSeq = new SubscriptionTransitionData(cur, seqId);
                 return new DefaultSubscriptionEvent(withSeq, startDate);
             }
         }
@@ -292,12 +296,12 @@ public class SubscriptionData extends EntityBase implements Subscription {
     }
 
     public long getLastEventOrderedId() {
-        SubscriptionTransitionDataIterator it = new SubscriptionTransitionDataIterator(
+        final SubscriptionTransitionDataIterator it = new SubscriptionTransitionDataIterator(
                 clock, transitions, Order.DESC_FROM_FUTURE, Kind.ENTITLEMENT,
                 Visibility.FROM_DISK_ONLY, TimeLimit.ALL);
-        return it.hasNext() ? it.next().getTotalOrdering() :  -1L;
+        return it.hasNext() ? it.next().getTotalOrdering() : -1L;
     }
-    
+
     public long getActiveVersion() {
         return activeVersion;
     }
@@ -313,11 +317,11 @@ public class SubscriptionData extends EntityBase implements Subscription {
                     "No transitions for subscription %s", getId()));
         }
 
-        SubscriptionTransitionDataIterator it = new SubscriptionTransitionDataIterator(
+        final SubscriptionTransitionDataIterator it = new SubscriptionTransitionDataIterator(
                 clock, transitions, Order.DESC_FROM_FUTURE, Kind.ENTITLEMENT,
                 Visibility.ALL, TimeLimit.PAST_OR_PRESENT_ONLY);
         while (it.hasNext()) {
-            SubscriptionTransitionData cur = it.next();
+            final SubscriptionTransitionData cur = it.next();
             if (cur.getTransitionType() == SubscriptionTransitionType.CREATE
                     || cur.getTransitionType() == SubscriptionTransitionType.RE_CREATE
                     || cur.getTransitionType() == SubscriptionTransitionType.CHANGE
@@ -334,11 +338,11 @@ public class SubscriptionData extends EntityBase implements Subscription {
         if (transitions == null) {
             return false;
         }
-        SubscriptionTransitionDataIterator it = new SubscriptionTransitionDataIterator(
+        final SubscriptionTransitionDataIterator it = new SubscriptionTransitionDataIterator(
                 clock, transitions, Order.ASC_FROM_PAST, Kind.ENTITLEMENT,
                 Visibility.ALL, TimeLimit.FUTURE_ONLY);
         while (it.hasNext()) {
-            SubscriptionTransitionData cur = it.next();
+            final SubscriptionTransitionData cur = it.next();
             if (cur.getTransitionType() == SubscriptionTransitionType.CANCEL) {
                 return true;
             }
@@ -346,8 +350,8 @@ public class SubscriptionData extends EntityBase implements Subscription {
         return false;
     }
 
-    public DateTime getPlanChangeEffectiveDate(ActionPolicy policy,
-            DateTime requestedDate) {
+    public DateTime getPlanChangeEffectiveDate(final ActionPolicy policy,
+                                               final DateTime requestedDate) {
 
         if (policy == ActionPolicy.IMMEDIATE) {
             return requestedDate;
@@ -371,11 +375,11 @@ public class SubscriptionData extends EntityBase implements Subscription {
             throw new EntitlementError(String.format(
                     "No transitions for subscription %s", getId()));
         }
-        SubscriptionTransitionDataIterator it = new SubscriptionTransitionDataIterator(
+        final SubscriptionTransitionDataIterator it = new SubscriptionTransitionDataIterator(
                 clock, transitions, Order.DESC_FROM_FUTURE, Kind.ENTITLEMENT,
                 Visibility.ALL, TimeLimit.PAST_OR_PRESENT_ONLY);
         while (it.hasNext()) {
-            SubscriptionTransitionData cur = it.next();
+            final SubscriptionTransitionData cur = it.next();
 
             if (cur.getTransitionType() == SubscriptionTransitionType.PHASE
                     || cur.getTransitionType() == SubscriptionTransitionType.CREATE
@@ -390,7 +394,7 @@ public class SubscriptionData extends EntityBase implements Subscription {
     }
 
     public void rebuildTransitions(final List<EntitlementEvent> inputEvents,
-            final Catalog catalog) {
+                                   final Catalog catalog) {
 
         if (inputEvents == null) {
             return;
@@ -399,7 +403,7 @@ public class SubscriptionData extends EntityBase implements Subscription {
         SubscriptionState nextState = null;
         String nextPlanName = null;
         String nextPhaseName = null;
-        String nextPriceListName = null; 
+        String nextPriceListName = null;
         UUID nextUserToken = null;
 
         SubscriptionState previousState = null;
@@ -421,52 +425,52 @@ public class SubscriptionData extends EntityBase implements Subscription {
 
             switch (cur.getType()) {
 
-            case PHASE:
-                PhaseEvent phaseEV = (PhaseEvent) cur;
-                nextPhaseName = phaseEV.getPhase();
-                break;
-
-            case API_USER:
-                ApiEvent userEV = (ApiEvent) cur;
-                apiEventType = userEV.getEventType();
-                isFromDisk = userEV.isFromDisk();
-                nextUserToken = userEV.getUserToken();
-
-                switch (apiEventType) {
-                case MIGRATE_BILLING:
-                case MIGRATE_ENTITLEMENT:
-                case CREATE:
-                case RE_CREATE:
-                    previousState = null;
-                    previousPlan = null;
-                    previousPhase = null;
-                    previousPriceList = null;
-                    nextState = SubscriptionState.ACTIVE;
-                    nextPlanName = userEV.getEventPlan();
-                    nextPhaseName = userEV.getEventPlanPhase();
-                    nextPriceListName = userEV.getPriceList();
-                    break;
-                case CHANGE:
-                    nextPlanName = userEV.getEventPlan();
-                    nextPhaseName = userEV.getEventPlanPhase();
-                    nextPriceListName = userEV.getPriceList();
+                case PHASE:
+                    final PhaseEvent phaseEV = (PhaseEvent) cur;
+                    nextPhaseName = phaseEV.getPhase();
                     break;
-                case CANCEL:
-                    nextState = SubscriptionState.CANCELLED;
-                    nextPlanName = null;
-                    nextPhaseName = null;
-                    break;
-                case UNCANCEL:
+
+                case API_USER:
+                    final ApiEvent userEV = (ApiEvent) cur;
+                    apiEventType = userEV.getEventType();
+                    isFromDisk = userEV.isFromDisk();
+                    nextUserToken = userEV.getUserToken();
+
+                    switch (apiEventType) {
+                        case MIGRATE_BILLING:
+                        case MIGRATE_ENTITLEMENT:
+                        case CREATE:
+                        case RE_CREATE:
+                            previousState = null;
+                            previousPlan = null;
+                            previousPhase = null;
+                            previousPriceList = null;
+                            nextState = SubscriptionState.ACTIVE;
+                            nextPlanName = userEV.getEventPlan();
+                            nextPhaseName = userEV.getEventPlanPhase();
+                            nextPriceListName = userEV.getPriceList();
+                            break;
+                        case CHANGE:
+                            nextPlanName = userEV.getEventPlan();
+                            nextPhaseName = userEV.getEventPlanPhase();
+                            nextPriceListName = userEV.getPriceList();
+                            break;
+                        case CANCEL:
+                            nextState = SubscriptionState.CANCELLED;
+                            nextPlanName = null;
+                            nextPhaseName = null;
+                            break;
+                        case UNCANCEL:
+                            break;
+                        default:
+                            throw new EntitlementError(String.format(
+                                    "Unexpected UserEvent type = %s", userEV
+                                    .getEventType().toString()));
+                    }
                     break;
                 default:
                     throw new EntitlementError(String.format(
-                            "Unexpected UserEvent type = %s", userEV
-                                    .getEventType().toString()));
-                }
-                break;
-            default:
-                throw new EntitlementError(String.format(
-                        "Unexpected Event type = %s", cur.getType()));
+                            "Unexpected Event type = %s", cur.getType()));
             }
 
             Plan nextPlan = null;
@@ -480,9 +484,9 @@ public class SubscriptionData extends EntityBase implements Subscription {
             } catch (CatalogApiException e) {
                 log.error(String.format(
                         "Failed to build transition for subscription %s", id),
-                        e);
+                          e);
             }
-            SubscriptionTransitionData transition = new SubscriptionTransitionData(
+            final SubscriptionTransitionData transition = new SubscriptionTransitionData(
                     cur.getId(), id, bundleId, cur.getType(), apiEventType,
                     cur.getRequestedDate(), cur.getEffectiveDate(),
                     previousState, previousPlan, previousPhase,

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionEvents.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionEvents.java
index 66dfb88..31d664d 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionEvents.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionEvents.java
@@ -16,28 +16,27 @@
 
 package com.ning.billing.entitlement.api.user;
 
-import com.ning.billing.entitlement.events.EntitlementEvent;
-
 import java.util.LinkedList;
 import java.util.UUID;
 
+import com.ning.billing.entitlement.events.EntitlementEvent;
+
 public class SubscriptionEvents {
 
     public static final long INITIAL_VERSION = 1;
 
-    private final UUID subscriptionId;
     private final LinkedList<EntitlementEvent> events;
 
     private long activeVersion;
 
-    public SubscriptionEvents(UUID subscriptionId) {
+    public SubscriptionEvents(final UUID subscriptionId) {
         super();
-        this.subscriptionId = subscriptionId;
+        final UUID subscriptionId1 = subscriptionId;
         this.events = new LinkedList<EntitlementEvent>();
         this.activeVersion = INITIAL_VERSION;
     }
 
-    public void addEvent(EntitlementEvent ev) {
+    public void addEvent(final EntitlementEvent ev) {
         events.add(ev);
     }
 
@@ -47,8 +46,8 @@ public class SubscriptionEvents {
 
     public LinkedList<EntitlementEvent> getViewForVersion(final long version) {
 
-        LinkedList<EntitlementEvent> result = new LinkedList<EntitlementEvent>();
-        for (EntitlementEvent cur : events) {
+        final LinkedList<EntitlementEvent> result = new LinkedList<EntitlementEvent>();
+        for (final EntitlementEvent cur : events) {
             if (cur.getActiveVersion() == version) {
                 result.add(cur);
             }
@@ -61,7 +60,7 @@ public class SubscriptionEvents {
         return activeVersion;
     }
 
-    public void setActiveVersion(long activeVersion) {
+    public void setActiveVersion(final long activeVersion) {
         this.activeVersion = activeVersion;
     }
 }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionTransitionData.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionTransitionData.java
index 4a8d90b..ac54ea3 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionTransitionData.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionTransitionData.java
@@ -22,8 +22,8 @@ import org.joda.time.DateTime;
 
 import com.ning.billing.catalog.api.Plan;
 import com.ning.billing.catalog.api.PlanPhase;
-import com.ning.billing.entitlement.api.SubscriptionTransitionType;
 import com.ning.billing.catalog.api.PriceList;
+import com.ning.billing.entitlement.api.SubscriptionTransitionType;
 import com.ning.billing.entitlement.api.user.Subscription.SubscriptionState;
 import com.ning.billing.entitlement.events.EntitlementEvent.EventType;
 import com.ning.billing.entitlement.events.user.ApiEventType;
@@ -53,24 +53,24 @@ public class SubscriptionTransitionData /* implements SubscriptionEvent */ {
     private final UUID userToken;
 
 
-    public SubscriptionTransitionData(UUID eventId,
-            UUID subscriptionId,
-            UUID bundleId,
-            EventType eventType,
-            ApiEventType apiEventType,
-            DateTime requestedTransitionTime,
-            DateTime effectiveTransitionTime,
-            SubscriptionState previousState,
-            Plan previousPlan,
-            PlanPhase previousPhase,
-            PriceList previousPriceList,
-            SubscriptionState nextState,
-            Plan nextPlan,
-            PlanPhase nextPhase,
-            PriceList nextPriceList,
-            Long totalOrdering,
-            UUID userToken,
-            Boolean isFromDisk) {
+    public SubscriptionTransitionData(final UUID eventId,
+                                      final UUID subscriptionId,
+                                      final UUID bundleId,
+                                      final EventType eventType,
+                                      final ApiEventType apiEventType,
+                                      final DateTime requestedTransitionTime,
+                                      final DateTime effectiveTransitionTime,
+                                      final SubscriptionState previousState,
+                                      final Plan previousPlan,
+                                      final PlanPhase previousPhase,
+                                      final PriceList previousPriceList,
+                                      final SubscriptionState nextState,
+                                      final Plan nextPlan,
+                                      final PlanPhase nextPhase,
+                                      final PriceList nextPriceList,
+                                      final Long totalOrdering,
+                                      final UUID userToken,
+                                      final Boolean isFromDisk) {
         super();
         this.eventId = eventId;
         this.subscriptionId = subscriptionId;
@@ -92,7 +92,7 @@ public class SubscriptionTransitionData /* implements SubscriptionEvent */ {
         this.userToken = userToken;
         this.remainingEventsForUserOperation = 0;
     }
-    
+
     public SubscriptionTransitionData(final SubscriptionTransitionData input, final int remainingEventsForUserOperation) {
         super();
         this.eventId = input.getId();
@@ -161,28 +161,28 @@ public class SubscriptionTransitionData /* implements SubscriptionEvent */ {
     public PriceList getNextPriceList() {
         return nextPriceList;
     }
-    
-	public UUID getUserToken() {
-		return userToken;
-	}
-	
-	public Integer getRemainingEventsForUserOperation() {
-		return remainingEventsForUserOperation;
-	}
+
+    public UUID getUserToken() {
+        return userToken;
+    }
+
+    public Integer getRemainingEventsForUserOperation() {
+        return remainingEventsForUserOperation;
+    }
 
 
     public SubscriptionTransitionType getTransitionType() {
         return toSubscriptionTransitionType(eventType, apiEventType);
     }
-    
-    public static SubscriptionTransitionType toSubscriptionTransitionType(EventType eventType, ApiEventType apiEventType) {
-        switch(eventType) {
-        case API_USER:
-            return apiEventType.getSubscriptionTransitionType();
-        case PHASE:
-            return SubscriptionTransitionType.PHASE;
-        default:
-            throw new EntitlementError("Unexpected event type " + eventType);
+
+    public static SubscriptionTransitionType toSubscriptionTransitionType(final EventType eventType, final ApiEventType apiEventType) {
+        switch (eventType) {
+            case API_USER:
+                return apiEventType.getSubscriptionTransitionType();
+            case PHASE:
+                return SubscriptionTransitionType.PHASE;
+            default:
+                throw new EntitlementError("Unexpected event type " + eventType);
         }
     }
 
@@ -215,17 +215,17 @@ public class SubscriptionTransitionData /* implements SubscriptionEvent */ {
     @Override
     public String toString() {
         return "SubscriptionTransition [eventId=" + eventId
-            + ", subscriptionId=" + subscriptionId
-            + ", eventType=" + eventType + ", apiEventType="
-            + apiEventType + ", requestedTransitionTime=" + requestedTransitionTime
-            + ", effectiveTransitionTime=" + effectiveTransitionTime
-            + ", previousState=" + previousState + ", previousPlan="
-            + ((previousPlan != null) ? previousPlan.getName()  : null)
-            + ", previousPhase=" + ((previousPhase != null) ? previousPhase.getName() : null)
-            + ", previousPriceList " + previousPriceList
-            + ", nextState=" + nextState
-            + ", nextPlan=" + ((nextPlan != null) ? nextPlan.getName() : null)
-            + ", nextPriceList " + nextPriceList
-            + ", nextPhase=" + ((nextPhase != null) ? nextPhase.getName() : null) + "]";
+                + ", subscriptionId=" + subscriptionId
+                + ", eventType=" + eventType + ", apiEventType="
+                + apiEventType + ", requestedTransitionTime=" + requestedTransitionTime
+                + ", effectiveTransitionTime=" + effectiveTransitionTime
+                + ", previousState=" + previousState + ", previousPlan="
+                + ((previousPlan != null) ? previousPlan.getName() : null)
+                + ", previousPhase=" + ((previousPhase != null) ? previousPhase.getName() : null)
+                + ", previousPriceList " + previousPriceList
+                + ", nextState=" + nextState
+                + ", nextPlan=" + ((nextPlan != null) ? nextPlan.getName() : null)
+                + ", nextPriceList " + nextPriceList
+                + ", nextPhase=" + ((nextPhase != null) ? nextPhase.getName() : null) + "]";
     }
 }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionTransitionDataIterator.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionTransitionDataIterator.java
index 355628d..bd9ec62 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionTransitionDataIterator.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionTransitionDataIterator.java
@@ -55,10 +55,10 @@ public class SubscriptionTransitionDataIterator implements Iterator<Subscription
         ALL
     }
 
-    public SubscriptionTransitionDataIterator(Clock clock, LinkedList<SubscriptionTransitionData> transitions,
-            Order order, Kind kind, Visibility visibility, TimeLimit timeLimit) {
+    public SubscriptionTransitionDataIterator(final Clock clock, final LinkedList<SubscriptionTransitionData> transitions,
+                                              final Order order, final Kind kind, final Visibility visibility, final TimeLimit timeLimit) {
         this.it = (order == Order.DESC_FROM_FUTURE) ? transitions.descendingIterator() : transitions.iterator();
-        this. clock = clock;
+        this.clock = clock;
         this.kind = kind;
         this.timeLimit = timeLimit;
         this.visibility = visibility;
@@ -68,16 +68,16 @@ public class SubscriptionTransitionDataIterator implements Iterator<Subscription
     @Override
     public boolean hasNext() {
         do {
-            boolean hasNext = it.hasNext();
+            final boolean hasNext = it.hasNext();
             if (!hasNext) {
                 return false;
             }
             next = it.next();
-        }  while (shouldSkip(next));
+        } while (shouldSkip(next));
         return true;
     }
 
-    private boolean shouldSkip(SubscriptionTransitionData input) {
+    private boolean shouldSkip(final SubscriptionTransitionData input) {
         if (visibility == Visibility.FROM_DISK_ONLY && !input.isFromDisk()) {
             return true;
         }
@@ -85,7 +85,7 @@ public class SubscriptionTransitionDataIterator implements Iterator<Subscription
                 (kind == Kind.BILLING && input.getTransitionType() == SubscriptionTransitionType.MIGRATE_ENTITLEMENT)) {
             return true;
         }
-        if ((timeLimit == TimeLimit.FUTURE_ONLY && ! input.getEffectiveTransitionTime().isAfter(clock.getUTCNow())) ||
+        if ((timeLimit == TimeLimit.FUTURE_ONLY && !input.getEffectiveTransitionTime().isAfter(clock.getUTCNow())) ||
                 ((timeLimit == TimeLimit.PAST_OR_PRESENT_ONLY && input.getEffectiveTransitionTime().isAfter(clock.getUTCNow())))) {
             return true;
         }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/engine/addon/AddonUtils.java b/entitlement/src/main/java/com/ning/billing/entitlement/engine/addon/AddonUtils.java
index 2a4a550..44079d8 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/engine/addon/AddonUtils.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/engine/addon/AddonUtils.java
@@ -26,11 +26,9 @@ import com.ning.billing.catalog.api.CatalogApiException;
 import com.ning.billing.catalog.api.CatalogService;
 import com.ning.billing.catalog.api.Plan;
 import com.ning.billing.catalog.api.Product;
-import com.ning.billing.entitlement.api.user.Subscription;
-import com.ning.billing.entitlement.api.user.Subscription.SubscriptionState;
 import com.ning.billing.entitlement.api.user.EntitlementUserApiException;
+import com.ning.billing.entitlement.api.user.Subscription.SubscriptionState;
 import com.ning.billing.entitlement.api.user.SubscriptionData;
-import com.ning.billing.entitlement.api.user.SubscriptionEvent;
 import com.ning.billing.entitlement.exceptions.EntitlementError;
 
 public class AddonUtils {
@@ -40,32 +38,32 @@ public class AddonUtils {
     private final CatalogService catalogService;
 
     @Inject
-    public AddonUtils(CatalogService catalogService) {
+    public AddonUtils(final CatalogService catalogService) {
         this.catalogService = catalogService;
     }
 
-    public void checkAddonCreationRights(SubscriptionData baseSubscription, Plan targetAddOnPlan)
-    throws EntitlementUserApiException, CatalogApiException {
+    public void checkAddonCreationRights(final SubscriptionData baseSubscription, final Plan targetAddOnPlan)
+            throws EntitlementUserApiException, CatalogApiException {
 
         if (baseSubscription.getState() != SubscriptionState.ACTIVE) {
             throw new EntitlementUserApiException(ErrorCode.ENT_CREATE_AO_BP_NON_ACTIVE, targetAddOnPlan.getName());
         }
 
-        Product baseProduct = baseSubscription.getCurrentPlan().getProduct();
+        final Product baseProduct = baseSubscription.getCurrentPlan().getProduct();
         if (isAddonIncluded(baseProduct, targetAddOnPlan)) {
             throw new EntitlementUserApiException(ErrorCode.ENT_CREATE_AO_ALREADY_INCLUDED,
-                    targetAddOnPlan.getName(), baseSubscription.getCurrentPlan().getProduct().getName());
+                                                  targetAddOnPlan.getName(), baseSubscription.getCurrentPlan().getProduct().getName());
         }
 
         if (!isAddonAvailable(baseProduct, targetAddOnPlan)) {
             throw new EntitlementUserApiException(ErrorCode.ENT_CREATE_AO_NOT_AVAILABLE,
-                    targetAddOnPlan.getName(), baseSubscription.getCurrentPlan().getProduct().getName());
+                                                  targetAddOnPlan.getName(), baseSubscription.getCurrentPlan().getProduct().getName());
         }
     }
 
     public boolean isAddonAvailableFromProdName(final String baseProductName, final DateTime requestedDate, final Plan targetAddOnPlan) {
         try {
-            Product product = catalogService.getFullCatalog().findProduct(baseProductName, requestedDate);
+            final Product product = catalogService.getFullCatalog().findProduct(baseProductName, requestedDate);
             return isAddonAvailable(product, targetAddOnPlan);
         } catch (CatalogApiException e) {
             throw new EntitlementError(e);
@@ -74,8 +72,8 @@ public class AddonUtils {
 
     public boolean isAddonAvailableFromPlanName(final String basePlanName, final DateTime requestedDate, final Plan targetAddOnPlan) {
         try {
-            Plan plan = catalogService.getFullCatalog().findPlan(basePlanName, requestedDate);
-            Product product = plan.getProduct();
+            final Plan plan = catalogService.getFullCatalog().findPlan(basePlanName, requestedDate);
+            final Product product = plan.getProduct();
             return isAddonAvailable(product, targetAddOnPlan);
         } catch (CatalogApiException e) {
             throw new EntitlementError(e);
@@ -83,20 +81,20 @@ public class AddonUtils {
     }
 
     public boolean isAddonAvailable(final Product baseProduct, final Plan targetAddOnPlan) {
-        Product targetAddonProduct = targetAddOnPlan.getProduct();
-        Product[] availableAddOns = baseProduct.getAvailable();
+        final Product targetAddonProduct = targetAddOnPlan.getProduct();
+        final Product[] availableAddOns = baseProduct.getAvailable();
 
-        for (Product curAv : availableAddOns) {
+        for (final Product curAv : availableAddOns) {
             if (curAv.getName().equals(targetAddonProduct.getName())) {
                 return true;
             }
         }
         return false;
     }
-    
+
     public boolean isAddonIncludedFromProdName(final String baseProductName, final DateTime requestedDate, final Plan targetAddOnPlan) {
-        try {            
-            Product product = catalogService.getFullCatalog().findProduct(baseProductName, requestedDate);
+        try {
+            final Product product = catalogService.getFullCatalog().findProduct(baseProductName, requestedDate);
             return isAddonIncluded(product, targetAddOnPlan);
         } catch (CatalogApiException e) {
             throw new EntitlementError(e);
@@ -105,9 +103,9 @@ public class AddonUtils {
     }
 
     public boolean isAddonIncludedFromPlanName(final String basePlanName, final DateTime requestedDate, final Plan targetAddOnPlan) {
-        try {            
-            Plan plan = catalogService.getFullCatalog().findPlan(basePlanName, requestedDate);
-            Product product = plan.getProduct();
+        try {
+            final Plan plan = catalogService.getFullCatalog().findPlan(basePlanName, requestedDate);
+            final Product product = plan.getProduct();
             return isAddonIncluded(product, targetAddOnPlan);
         } catch (CatalogApiException e) {
             throw new EntitlementError(e);
@@ -115,9 +113,9 @@ public class AddonUtils {
     }
 
     public boolean isAddonIncluded(final Product baseProduct, final Plan targetAddOnPlan) {
-        Product targetAddonProduct = targetAddOnPlan.getProduct();
-        Product[] includedAddOns = baseProduct.getIncluded();
-        for (Product curAv : includedAddOns) {
+        final Product targetAddonProduct = targetAddOnPlan.getProduct();
+        final Product[] includedAddOns = baseProduct.getIncluded();
+        for (final Product curAv : includedAddOns) {
             if (curAv.getName().equals(targetAddonProduct.getName())) {
                 return true;
             }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/Engine.java b/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/Engine.java
index d5b9fb1..3e8c025 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/Engine.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/Engine.java
@@ -17,7 +17,6 @@
 package com.ning.billing.entitlement.engine.core;
 
 
-
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -29,8 +28,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.inject.Inject;
-
-
 import com.ning.billing.catalog.api.Plan;
 import com.ning.billing.catalog.api.Product;
 import com.ning.billing.catalog.api.ProductCategory;
@@ -70,11 +67,11 @@ import com.ning.billing.util.notificationq.NotificationQueueService.Notification
 
 public class Engine implements EventListener, EntitlementService {
 
-	
+
     public static final String NOTIFICATION_QUEUE_NAME = "subscription-events";
     public static final String ENTITLEMENT_SERVICE_NAME = "entitlement-service";
 
-    private final static Logger log = LoggerFactory.getLogger(Engine.class);
+    private static final Logger log = LoggerFactory.getLogger(Engine.class);
 
     private final Clock clock;
     private final EntitlementDao dao;
@@ -89,12 +86,12 @@ public class Engine implements EventListener, EntitlementService {
     private NotificationQueue subscriptionEventQueue;
 
     @Inject
-    public Engine(Clock clock, EntitlementDao dao, PlanAligner planAligner,
-            EntitlementConfig config,
-            AddonUtils addonUtils, Bus eventBus,
-            NotificationQueueService notificationQueueService,
-            SubscriptionFactory subscriptionFactory,
-            CallContextFactory factory) {
+    public Engine(final Clock clock, final EntitlementDao dao, final PlanAligner planAligner,
+                  final EntitlementConfig config,
+                  final AddonUtils addonUtils, final Bus eventBus,
+                  final NotificationQueueService notificationQueueService,
+                  final SubscriptionFactory subscriptionFactory,
+                  final CallContextFactory factory) {
         super();
         this.clock = clock;
         this.dao = dao;
@@ -117,34 +114,35 @@ public class Engine implements EventListener, EntitlementService {
 
         try {
             subscriptionEventQueue = notificationQueueService.createNotificationQueue(ENTITLEMENT_SERVICE_NAME,
-                    NOTIFICATION_QUEUE_NAME,
-                    new NotificationQueueHandler() {
-                @Override
-                public void handleReadyNotification(final String inputKey, final DateTime eventDateTime) {
-                	
-                	EntitlementNotificationKey key = new EntitlementNotificationKey(inputKey);
-                    final EntitlementEvent event = dao.getEventById(key.getEventId());
-                    if (event == null) {
-                        log.warn("Failed to extract event for notification key {}", inputKey);
-                        return;
-                    }
-                    final UUID userToken =  (event.getType() == EventType.API_USER) ? ((ApiEvent) event).getUserToken() : null;
-                    final CallContext context = factory.createCallContext("SubscriptionEventQueue", CallOrigin.INTERNAL, UserType.SYSTEM, userToken);
-                    processEventReady(event, key.getSeqId(), context);
-                }
-            },
-            new NotificationConfig() {
-                
-                @Override
-                public long getSleepTimeMs() {
-                    return config.getSleepTimeMs();
-                }
-                
-                @Override
-                public boolean isNotificationProcessingOff() {
-                    return config.isNotificationProcessingOff();
-                }
-            });
+                                                                                      NOTIFICATION_QUEUE_NAME,
+                                                                                      new NotificationQueueHandler() {
+                                                                                          @Override
+                                                                                          public void handleReadyNotification(final String inputKey, final DateTime eventDateTime) {
+
+                                                                                              final EntitlementNotificationKey key = new EntitlementNotificationKey(inputKey);
+                                                                                              final EntitlementEvent event = dao.getEventById(key.getEventId());
+                                                                                              if (event == null) {
+                                                                                                  log.warn("Failed to extract event for notification key {}", inputKey);
+                                                                                                  return;
+                                                                                              }
+                                                                                              final UUID userToken = (event.getType() == EventType.API_USER) ? ((ApiEvent) event).getUserToken() : null;
+                                                                                              final CallContext context = factory.createCallContext("SubscriptionEventQueue", CallOrigin.INTERNAL, UserType.SYSTEM, userToken);
+                                                                                              processEventReady(event, key.getSeqId(), context);
+                                                                                          }
+                                                                                      },
+                                                                                      new NotificationConfig() {
+
+                                                                                          @Override
+                                                                                          public long getSleepTimeMs() {
+                                                                                              return config.getSleepTimeMs();
+                                                                                          }
+
+                                                                                          @Override
+                                                                                          public boolean isNotificationProcessingOff() {
+                                                                                              return config.isNotificationProcessingOff();
+                                                                                          }
+                                                                                      }
+                                                                                     );
         } catch (NotificationQueueAlreadyExists e) {
             throw new RuntimeException(e);
         }
@@ -160,16 +158,16 @@ public class Engine implements EventListener, EntitlementService {
         if (subscriptionEventQueue != null) {
             subscriptionEventQueue.stopQueue();
             notificationQueueService.deleteNotificationQueue(subscriptionEventQueue.getServiceName(), subscriptionEventQueue.getQueueName());
-         }
+        }
     }
-    
+
 
     @Override
     public void processEventReady(final EntitlementEvent event, final int seqId, final CallContext context) {
         if (!event.isActive()) {
             return;
         }
-        SubscriptionData subscription = (SubscriptionData) dao.getSubscriptionFromId(subscriptionFactory, event.getSubscriptionId());
+        final SubscriptionData subscription = (SubscriptionData) dao.getSubscriptionFromId(subscriptionFactory, event.getSubscriptionId());
         if (subscription == null) {
             log.warn("Failed to retrieve subscription for id %s", event.getSubscriptionId());
             return;
@@ -178,17 +176,17 @@ public class Engine implements EventListener, EntitlementService {
             // Skip repaired events
             return;
         }
-        
+
         //
         // Do any internal processing on that event before we send the event to the bus
         //
-        
+
         int theRealSeqId = seqId;
         if (event.getType() == EventType.PHASE) {
             onPhaseEvent(subscription, context);
         } else if (event.getType() == EventType.API_USER &&
                 subscription.getCategory() == ProductCategory.BASE) {
-        	theRealSeqId = onBasePlanEvent(subscription, (ApiEvent) event, context);
+            theRealSeqId = onBasePlanEvent(subscription, (ApiEvent) event, context);
         }
         try {
             eventBus.post(subscription.getTransitionFromEvent(event, theRealSeqId));
@@ -198,13 +196,13 @@ public class Engine implements EventListener, EntitlementService {
     }
 
 
-    private void onPhaseEvent(SubscriptionData subscription, CallContext context) {
+    private void onPhaseEvent(final SubscriptionData subscription, final CallContext context) {
         try {
-            DateTime now = clock.getUTCNow();
-            TimedPhase nextTimedPhase = planAligner.getNextTimedPhase(subscription, now, now);
-            PhaseEvent nextPhaseEvent = (nextTimedPhase != null) ?
+            final DateTime now = clock.getUTCNow();
+            final TimedPhase nextTimedPhase = planAligner.getNextTimedPhase(subscription, now, now);
+            final PhaseEvent nextPhaseEvent = (nextTimedPhase != null) ?
                     PhaseEventData.createNextPhaseEvent(nextTimedPhase.getPhase().getName(), subscription, now, nextTimedPhase.getStartPhase()) :
-                        null;
+                    null;
             if (nextPhaseEvent != null) {
                 dao.createNextPhaseEvent(subscription.getId(), nextPhaseEvent, context);
             }
@@ -213,41 +211,41 @@ public class Engine implements EventListener, EntitlementService {
         }
     }
 
-    private int onBasePlanEvent(SubscriptionData baseSubscription, ApiEvent event, CallContext context) {
+    private int onBasePlanEvent(final SubscriptionData baseSubscription, final ApiEvent event, final CallContext context) {
 
-        DateTime now = clock.getUTCNow();
+        final DateTime now = clock.getUTCNow();
 
-        Product baseProduct = (baseSubscription.getState() == SubscriptionState.CANCELLED ) ?
+        final Product baseProduct = (baseSubscription.getState() == SubscriptionState.CANCELLED) ?
                 null : baseSubscription.getCurrentPlan().getProduct();
 
-        List<Subscription> subscriptions = dao.getSubscriptions(subscriptionFactory, baseSubscription.getBundleId());
+        final List<Subscription> subscriptions = dao.getSubscriptions(subscriptionFactory, baseSubscription.getBundleId());
 
-        
-        Map<UUID, EntitlementEvent> addOnCancellations = new HashMap<UUID, EntitlementEvent>();
-        
-        Iterator<Subscription> it = subscriptions.iterator();
+
+        final Map<UUID, EntitlementEvent> addOnCancellations = new HashMap<UUID, EntitlementEvent>();
+
+        final Iterator<Subscription> it = subscriptions.iterator();
         while (it.hasNext()) {
-            SubscriptionData cur = (SubscriptionData) it.next();
+            final SubscriptionData cur = (SubscriptionData) it.next();
             if (cur.getState() == SubscriptionState.CANCELLED ||
                     cur.getCategory() != ProductCategory.ADD_ON) {
                 continue;
             }
-            Plan addonCurrentPlan = cur.getCurrentPlan();
+            final Plan addonCurrentPlan = cur.getCurrentPlan();
             if (baseProduct == null ||
                     addonUtils.isAddonIncluded(baseProduct, addonCurrentPlan) ||
-                    ! addonUtils.isAddonAvailable(baseProduct, addonCurrentPlan)) {
+                    !addonUtils.isAddonAvailable(baseProduct, addonCurrentPlan)) {
                 //
                 // Perform AO cancellation using the effectiveDate of the BP
                 //
-                EntitlementEvent cancelEvent = new ApiEventCancel(new ApiEventBuilder()
-                .setSubscriptionId(cur.getId())
-                .setActiveVersion(cur.getActiveVersion())
-                .setProcessedDate(now)
-                .setEffectiveDate(event.getEffectiveDate())
-                .setRequestedDate(now)
-                .setUserToken(context.getUserToken())
-                .setFromDisk(true));
-                
+                final EntitlementEvent cancelEvent = new ApiEventCancel(new ApiEventBuilder()
+                                                                          .setSubscriptionId(cur.getId())
+                                                                          .setActiveVersion(cur.getActiveVersion())
+                                                                          .setProcessedDate(now)
+                                                                          .setEffectiveDate(event.getEffectiveDate())
+                                                                          .setRequestedDate(now)
+                                                                          .setUserToken(context.getUserToken())
+                                                                          .setFromDisk(true));
+
                 addOnCancellations.put(cur.getId(), cancelEvent);
             }
         }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/EntitlementNotificationKey.java b/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/EntitlementNotificationKey.java
index a4d19b0..ee35526 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/EntitlementNotificationKey.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/EntitlementNotificationKey.java
@@ -16,76 +16,83 @@
 package com.ning.billing.entitlement.engine.core;
 
 import java.util.UUID;
+
 import com.ning.billing.util.notificationq.NotificationKey;
 
 public class EntitlementNotificationKey implements NotificationKey {
 
-	private static final String DELIMITER = ":";
-	
-	private final UUID eventId;
-	private final int seqId;
-	
-	public EntitlementNotificationKey(final UUID eventId, int seqId) {
-		this.eventId = eventId;
-		this.seqId = seqId;
-	}
+    private static final String DELIMITER = ":";
+
+    private final UUID eventId;
+    private final int seqId;
+
+    public EntitlementNotificationKey(final UUID eventId, final int seqId) {
+        this.eventId = eventId;
+        this.seqId = seqId;
+    }
+
+    public EntitlementNotificationKey(final UUID eventId) {
+        this(eventId, 0);
+    }
+
+    public EntitlementNotificationKey(final String input) {
+
+        final String[] parts = input.split(DELIMITER);
+        eventId = UUID.fromString(parts[0]);
+        if (parts.length == 2) {
+            seqId = Integer.valueOf(parts[1]);
+        } else {
+            seqId = 0;
+        }
+    }
 
-	public EntitlementNotificationKey(final UUID eventId) {
-		this(eventId, 0);
-	}
-	
-	public EntitlementNotificationKey(final String input) {
-			
-		String [] parts = input.split(DELIMITER);
-		eventId = UUID.fromString(parts[0]);
-		if (parts.length == 2) {
-			seqId = Integer.valueOf(parts[1]);
-		} else {
-			seqId = 0;
-		}
-	}
-	
-	public UUID getEventId() {
-		return eventId;
-	}
+    public UUID getEventId() {
+        return eventId;
+    }
 
-	public int getSeqId() {
-		return seqId;
-	}
+    public int getSeqId() {
+        return seqId;
+    }
 
-	public String toString() {
-		if (seqId == 0) {
-			return eventId.toString();
-		} else {
-			return eventId.toString() + ":" + seqId;
-		}
-	}
+    public String toString() {
+        if (seqId == 0) {
+            return eventId.toString();
+        } else {
+            return eventId.toString() + ":" + seqId;
+        }
+    }
 
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((eventId == null) ? 0 : eventId.hashCode());
-		result = prime * result + seqId;
-		return result;
-	}
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((eventId == null) ? 0 : eventId.hashCode());
+        result = prime * result + seqId;
+        return result;
+    }
 
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		EntitlementNotificationKey other = (EntitlementNotificationKey) obj;
-		if (eventId == null) {
-			if (other.eventId != null)
-				return false;
-		} else if (!eventId.equals(other.eventId))
-			return false;
-		if (seqId != other.seqId)
-			return false;
-		return true;
-	}
+    @Override
+    public boolean equals(final Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final EntitlementNotificationKey other = (EntitlementNotificationKey) obj;
+        if (eventId == null) {
+            if (other.eventId != null) {
+                return false;
+            }
+        } else if (!eventId.equals(other.eventId)) {
+            return false;
+        }
+        if (seqId != other.seqId) {
+            return false;
+        }
+        return true;
+    }
 }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/AuditedEntitlementDao.java b/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/AuditedEntitlementDao.java
index b6a2f01..fab86f4 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/AuditedEntitlementDao.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/AuditedEntitlementDao.java
@@ -16,6 +16,7 @@
 
 package com.ning.billing.entitlement.engine.dao;
 
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -25,7 +26,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import javax.annotation.Nullable;
 
 import org.joda.time.DateTime;
 import org.skife.jdbi.v2.IDBI;
@@ -48,11 +48,11 @@ import com.ning.billing.entitlement.api.migration.AccountMigrationData.Subscript
 import com.ning.billing.entitlement.api.timeline.DefaultRepairEntitlementEvent;
 import com.ning.billing.entitlement.api.timeline.RepairEntitlementEvent;
 import com.ning.billing.entitlement.api.timeline.SubscriptionDataRepair;
+import com.ning.billing.entitlement.api.user.DefaultSubscriptionFactory.SubscriptionBuilder;
 import com.ning.billing.entitlement.api.user.Subscription;
 import com.ning.billing.entitlement.api.user.SubscriptionBundle;
 import com.ning.billing.entitlement.api.user.SubscriptionBundleData;
 import com.ning.billing.entitlement.api.user.SubscriptionData;
-import com.ning.billing.entitlement.api.user.DefaultSubscriptionFactory.SubscriptionBuilder;
 import com.ning.billing.entitlement.engine.addon.AddonUtils;
 import com.ning.billing.entitlement.engine.core.Engine;
 import com.ning.billing.entitlement.engine.core.EntitlementNotificationKey;
@@ -77,7 +77,7 @@ import com.ning.billing.util.notificationq.NotificationQueueService;
 import com.ning.billing.util.notificationq.NotificationQueueService.NoSuchNotificationQueue;
 
 public class AuditedEntitlementDao implements EntitlementDao {
-    private final static Logger log = LoggerFactory.getLogger(AuditedEntitlementDao.class);
+    private static final Logger log = LoggerFactory.getLogger(AuditedEntitlementDao.class);
 
     private final Clock clock;
     private final SubscriptionSqlDao subscriptionsDao;
@@ -121,11 +121,11 @@ public class AuditedEntitlementDao implements EntitlementDao {
     public SubscriptionBundle createSubscriptionBundle(final SubscriptionBundleData bundle, final CallContext context) {
         return bundlesDao.inTransaction(new Transaction<SubscriptionBundle, BundleSqlDao>() {
             @Override
-            public SubscriptionBundle inTransaction(BundleSqlDao transactional, TransactionStatus status) {
+            public SubscriptionBundle inTransaction(final BundleSqlDao transactional, final TransactionStatus status) {
                 bundlesDao.insertBundle(bundle, context);
-                Long recordId = bundlesDao.getRecordId(bundle.getId().toString());
+                final Long recordId = bundlesDao.getRecordId(bundle.getId().toString());
 
-                EntityAudit audit = new EntityAudit(TableName.BUNDLES, recordId, ChangeType.INSERT);
+                final EntityAudit audit = new EntityAudit(TableName.BUNDLES, recordId, ChangeType.INSERT);
                 bundlesDao.insertAuditFromTransaction(audit, context);
 
                 return bundle;
@@ -135,19 +135,19 @@ public class AuditedEntitlementDao implements EntitlementDao {
 
     @Override
     public UUID getAccountIdFromSubscriptionId(final UUID subscriptionId) {
-        Subscription subscription = subscriptionsDao.getSubscriptionFromId(subscriptionId.toString());
+        final Subscription subscription = subscriptionsDao.getSubscriptionFromId(subscriptionId.toString());
         if (subscription == null) {
             log.error(String.format(ErrorCode.ENT_INVALID_SUBSCRIPTION_ID.getFormat(), subscriptionId.toString()));
             return null;
         }
 
-        UUID bundleId = subscription.getBundleId();
+        final UUID bundleId = subscription.getBundleId();
         if (bundleId == null) {
             log.error(String.format(ErrorCode.ENT_GET_NO_BUNDLE_FOR_SUBSCRIPTION.getFormat(), subscriptionId.toString()));
             return null;
         }
 
-        SubscriptionBundle bundle = bundlesDao.getBundleFromId(bundleId.toString());
+        final SubscriptionBundle bundle = bundlesDao.getBundleFromId(bundleId.toString());
         if (bundle == null) {
             log.error(String.format(ErrorCode.ENT_GET_INVALID_BUNDLE_ID.getFormat(), bundleId.toString()));
             return null;
@@ -173,7 +173,7 @@ public class AuditedEntitlementDao implements EntitlementDao {
 
     @Override
     public List<Subscription> getSubscriptionsForKey(final SubscriptionFactory factory, final String bundleKey) {
-        SubscriptionBundle bundle =  bundlesDao.getBundleFromKey(bundleKey);
+        final SubscriptionBundle bundle = bundlesDao.getBundleFromKey(bundleKey);
         if (bundle == null) {
             return Collections.emptyList();
         }
@@ -183,24 +183,24 @@ public class AuditedEntitlementDao implements EntitlementDao {
     @Override
     public void updateChargedThroughDate(final SubscriptionData subscription, final CallContext context) {
 
-        final Date ctd = (subscription.getChargedThroughDate() != null)  ? subscription.getChargedThroughDate().toDate() : null;
+        final Date ctd = (subscription.getChargedThroughDate() != null) ? subscription.getChargedThroughDate().toDate() : null;
 
         subscriptionsDao.inTransaction(new Transaction<Void, SubscriptionSqlDao>() {
             @Override
-            public Void inTransaction(SubscriptionSqlDao transactionalDao,
-                    TransactionStatus status) throws Exception {
-                String subscriptionId = subscription.getId().toString();
+            public Void inTransaction(final SubscriptionSqlDao transactionalDao,
+                                      final TransactionStatus status) throws Exception {
+                final String subscriptionId = subscription.getId().toString();
                 transactionalDao.updateChargedThroughDate(subscription.getId().toString(), ctd, context);
-                Long subscriptionRecordId = transactionalDao.getRecordId(subscriptionId);
-                EntityAudit subscriptionAudit = new EntityAudit(TableName.SUBSCRIPTIONS, subscriptionRecordId, ChangeType.UPDATE);
+                final Long subscriptionRecordId = transactionalDao.getRecordId(subscriptionId);
+                final EntityAudit subscriptionAudit = new EntityAudit(TableName.SUBSCRIPTIONS, subscriptionRecordId, ChangeType.UPDATE);
                 transactionalDao.insertAuditFromTransaction(subscriptionAudit, context);
 
-                BundleSqlDao bundleSqlDao = transactionalDao.become(BundleSqlDao.class);
-                String bundleId = subscription.getBundleId().toString();
+                final BundleSqlDao bundleSqlDao = transactionalDao.become(BundleSqlDao.class);
+                final String bundleId = subscription.getBundleId().toString();
                 bundleSqlDao.updateBundleLastSysTime(bundleId, clock.getUTCNow().toDate());
                 // SubscriptionBundle bundle = bundleSqlDao.getById(bundleId);
-                Long recordId = bundleSqlDao.getRecordId(bundleId);
-                EntityAudit bundleAudit = new EntityAudit(TableName.BUNDLES, recordId, ChangeType.UPDATE);
+                final Long recordId = bundleSqlDao.getRecordId(bundleId);
+                final EntityAudit bundleAudit = new EntityAudit(TableName.BUNDLES, recordId, ChangeType.UPDATE);
                 bundleSqlDao.insertAuditFromTransaction(bundleAudit, context);
                 return null;
             }
@@ -211,29 +211,29 @@ public class AuditedEntitlementDao implements EntitlementDao {
     public void createNextPhaseEvent(final UUID subscriptionId, final EntitlementEvent nextPhase, final CallContext context) {
         eventsDao.inTransaction(new Transaction<Void, EntitlementEventSqlDao>() {
             @Override
-            public Void inTransaction(EntitlementEventSqlDao transactional, TransactionStatus status) throws Exception {
+            public Void inTransaction(final EntitlementEventSqlDao transactional, final TransactionStatus status) throws Exception {
                 cancelNextPhaseEventFromTransaction(subscriptionId, transactional, context);
                 transactional.insertEvent(nextPhase, context);
 
-                Long recordId = transactional.getRecordId(nextPhase.getId().toString());
-                EntityAudit audit = new EntityAudit(TableName.SUBSCRIPTION_EVENTS, recordId, ChangeType.INSERT);
+                final Long recordId = transactional.getRecordId(nextPhase.getId().toString());
+                final EntityAudit audit = new EntityAudit(TableName.SUBSCRIPTION_EVENTS, recordId, ChangeType.INSERT);
                 transactional.insertAuditFromTransaction(audit, context);
 
                 recordFutureNotificationFromTransaction(transactional,
-                        nextPhase.getEffectiveDate(),
-                        new EntitlementNotificationKey(nextPhase.getId()));
+                                                        nextPhase.getEffectiveDate(),
+                                                        new EntitlementNotificationKey(nextPhase.getId()));
                 return null;
             }
         });
     }
 
     @Override
-    public EntitlementEvent getEventById(UUID eventId) {
+    public EntitlementEvent getEventById(final UUID eventId) {
         return eventsDao.getEventById(eventId.toString());
     }
 
     @Override
-    public List<EntitlementEvent> getEventsForSubscription(UUID subscriptionId) {
+    public List<EntitlementEvent> getEventsForSubscription(final UUID subscriptionId) {
         return eventsDao.getEventsForSubscription(subscriptionId.toString());
     }
 
@@ -241,16 +241,16 @@ public class AuditedEntitlementDao implements EntitlementDao {
     public Map<UUID, List<EntitlementEvent>> getEventsForBundle(final UUID bundleId) {
         return subscriptionsDao.inTransaction(new Transaction<Map<UUID, List<EntitlementEvent>>, SubscriptionSqlDao>() {
             @Override
-            public Map<UUID, List<EntitlementEvent>> inTransaction(SubscriptionSqlDao transactional,
-                    TransactionStatus status) throws Exception {
-                List<Subscription> subscriptions = transactional.getSubscriptionsFromBundleId(bundleId.toString());
+            public Map<UUID, List<EntitlementEvent>> inTransaction(final SubscriptionSqlDao transactional,
+                                                                   final TransactionStatus status) throws Exception {
+                final List<Subscription> subscriptions = transactional.getSubscriptionsFromBundleId(bundleId.toString());
                 if (subscriptions.size() == 0) {
                     return Collections.emptyMap();
                 }
-                EntitlementEventSqlDao eventsDaoFromSameTransaction = transactional.become(EntitlementEventSqlDao.class);
-                Map<UUID, List<EntitlementEvent>> result = new HashMap<UUID, List<EntitlementEvent>>();
-                for (Subscription cur : subscriptions) {
-                    List<EntitlementEvent> events = eventsDaoFromSameTransaction.getEventsForSubscription(cur.getId().toString());
+                final EntitlementEventSqlDao eventsDaoFromSameTransaction = transactional.become(EntitlementEventSqlDao.class);
+                final Map<UUID, List<EntitlementEvent>> result = new HashMap<UUID, List<EntitlementEvent>>();
+                for (final Subscription cur : subscriptions) {
+                    final List<EntitlementEvent> events = eventsDaoFromSameTransaction.getEventsForSubscription(cur.getId().toString());
                     result.put(cur.getId(), events);
                 }
                 return result;
@@ -259,37 +259,37 @@ public class AuditedEntitlementDao implements EntitlementDao {
     }
 
     @Override
-    public List<EntitlementEvent> getPendingEventsForSubscription(UUID subscriptionId) {
-        Date now = clock.getUTCNow().toDate();
+    public List<EntitlementEvent> getPendingEventsForSubscription(final UUID subscriptionId) {
+        final Date now = clock.getUTCNow().toDate();
         return eventsDao.getFutureActiveEventForSubscription(subscriptionId.toString(), now);
     }
 
     @Override
     public void createSubscription(final SubscriptionData subscription,
-            final List<EntitlementEvent> initialEvents, final CallContext context) {
+                                   final List<EntitlementEvent> initialEvents, final CallContext context) {
 
         subscriptionsDao.inTransaction(new Transaction<Void, SubscriptionSqlDao>() {
 
             @Override
-            public Void inTransaction(SubscriptionSqlDao transactional,
-                    TransactionStatus status) throws Exception {
+            public Void inTransaction(final SubscriptionSqlDao transactional,
+                                      final TransactionStatus status) throws Exception {
 
                 transactional.insertSubscription(subscription, context);
-                Long subscriptionRecordId = transactional.getRecordId(subscription.getId().toString());
-                EntityAudit audit = new EntityAudit(TableName.SUBSCRIPTIONS, subscriptionRecordId, ChangeType.INSERT);
+                final Long subscriptionRecordId = transactional.getRecordId(subscription.getId().toString());
+                final EntityAudit audit = new EntityAudit(TableName.SUBSCRIPTIONS, subscriptionRecordId, ChangeType.INSERT);
                 transactional.insertAuditFromTransaction(audit, context);
 
                 // STEPH batch as well
-                EntitlementEventSqlDao eventsDaoFromSameTransaction = transactional.become(EntitlementEventSqlDao.class);
-                List<EntityAudit> audits = new ArrayList<EntityAudit>();
+                final EntitlementEventSqlDao eventsDaoFromSameTransaction = transactional.become(EntitlementEventSqlDao.class);
+                final List<EntityAudit> audits = new ArrayList<EntityAudit>();
 
                 for (final EntitlementEvent cur : initialEvents) {
                     eventsDaoFromSameTransaction.insertEvent(cur, context);
-                    Long recordId = eventsDaoFromSameTransaction.getRecordId(cur.getId().toString());
+                    final Long recordId = eventsDaoFromSameTransaction.getRecordId(cur.getId().toString());
                     audits.add(new EntityAudit(TableName.SUBSCRIPTION_EVENTS, recordId, ChangeType.INSERT));
                     recordFutureNotificationFromTransaction(transactional,
-                            cur.getEffectiveDate(),
-                            new EntitlementNotificationKey(cur.getId()));
+                                                            cur.getEffectiveDate(),
+                                                            new EntitlementNotificationKey(cur.getId()));
                 }
 
                 eventsDaoFromSameTransaction.insertAuditFromTransaction(audits, context);
@@ -300,21 +300,21 @@ public class AuditedEntitlementDao implements EntitlementDao {
 
     @Override
     public void recreateSubscription(final UUID subscriptionId,
-            final List<EntitlementEvent> recreateEvents, final CallContext context) {
+                                     final List<EntitlementEvent> recreateEvents, final CallContext context) {
 
         eventsDao.inTransaction(new Transaction<Void, EntitlementEventSqlDao>() {
             @Override
-            public Void inTransaction(EntitlementEventSqlDao transactional,
-                    TransactionStatus status) throws Exception {
+            public Void inTransaction(final EntitlementEventSqlDao transactional,
+                                      final TransactionStatus status) throws Exception {
 
-                List<EntityAudit> audits = new ArrayList<EntityAudit>();
+                final List<EntityAudit> audits = new ArrayList<EntityAudit>();
                 for (final EntitlementEvent cur : recreateEvents) {
                     transactional.insertEvent(cur, context);
-                    Long recordId = transactional.getRecordId(cur.getId().toString());
+                    final Long recordId = transactional.getRecordId(cur.getId().toString());
                     audits.add(new EntityAudit(TableName.SUBSCRIPTION_EVENTS, recordId, ChangeType.INSERT));
                     recordFutureNotificationFromTransaction(transactional,
-                            cur.getEffectiveDate(),
-                            new EntitlementNotificationKey(cur.getId()));
+                                                            cur.getEffectiveDate(),
+                                                            new EntitlementNotificationKey(cur.getId()));
 
                 }
 
@@ -329,21 +329,21 @@ public class AuditedEntitlementDao implements EntitlementDao {
 
         eventsDao.inTransaction(new Transaction<Void, EntitlementEventSqlDao>() {
             @Override
-            public Void inTransaction(EntitlementEventSqlDao transactional,
-                    TransactionStatus status) throws Exception {
+            public Void inTransaction(final EntitlementEventSqlDao transactional,
+                                      final TransactionStatus status) throws Exception {
                 cancelNextCancelEventFromTransaction(subscriptionId, transactional, context);
                 cancelNextChangeEventFromTransaction(subscriptionId, transactional, context);
                 cancelNextPhaseEventFromTransaction(subscriptionId, transactional, context);
                 transactional.insertEvent(cancelEvent, context);
-                String cancelEventId = cancelEvent.getId().toString();
+                final String cancelEventId = cancelEvent.getId().toString();
 
-                Long recordId = transactional.getRecordId(cancelEventId);
-                EntityAudit audit = new EntityAudit(TableName.SUBSCRIPTION_EVENTS, recordId, ChangeType.INSERT);
+                final Long recordId = transactional.getRecordId(cancelEventId);
+                final EntityAudit audit = new EntityAudit(TableName.SUBSCRIPTION_EVENTS, recordId, ChangeType.INSERT);
                 transactional.insertAuditFromTransaction(audit, context);
 
                 recordFutureNotificationFromTransaction(transactional,
-                        cancelEvent.getEffectiveDate(),
-                        new EntitlementNotificationKey(cancelEvent.getId(), seqId));
+                                                        cancelEvent.getEffectiveDate(),
+                                                        new EntitlementNotificationKey(cancelEvent.getId(), seqId));
                 return null;
             }
         });
@@ -355,14 +355,14 @@ public class AuditedEntitlementDao implements EntitlementDao {
         eventsDao.inTransaction(new Transaction<Void, EntitlementEventSqlDao>() {
 
             @Override
-            public Void inTransaction(EntitlementEventSqlDao transactional,
-                    TransactionStatus status) throws Exception {
+            public Void inTransaction(final EntitlementEventSqlDao transactional,
+                                      final TransactionStatus status) throws Exception {
 
                 EntitlementEvent cancelledEvent = null;
-                Date now = clock.getUTCNow().toDate();
-                List<EntitlementEvent> events = transactional.getFutureActiveEventForSubscription(subscriptionId.toString(), now);
+                final Date now = clock.getUTCNow().toDate();
+                final List<EntitlementEvent> events = transactional.getFutureActiveEventForSubscription(subscriptionId.toString(), now);
 
-                for (EntitlementEvent cur : events) {
+                for (final EntitlementEvent cur : events) {
                     if (cur.getType() == EventType.API_USER && ((ApiEvent) cur).getEventType() == ApiEventType.CANCEL) {
                         if (cancelledEvent != null) {
                             throw new EntitlementError(String.format("Found multiple cancel active events for subscriptions %s", subscriptionId.toString()));
@@ -372,20 +372,20 @@ public class AuditedEntitlementDao implements EntitlementDao {
                 }
 
                 if (cancelledEvent != null) {
-                    List<EntityAudit> eventAudits = new ArrayList<EntityAudit>();
+                    final List<EntityAudit> eventAudits = new ArrayList<EntityAudit>();
 
-                    String cancelledEventId = cancelledEvent.getId().toString();
+                    final String cancelledEventId = cancelledEvent.getId().toString();
                     transactional.unactiveEvent(cancelledEventId, context);
-                    Long cancelledRecordId = transactional.getRecordId(cancelledEventId);
+                    final Long cancelledRecordId = transactional.getRecordId(cancelledEventId);
                     eventAudits.add(new EntityAudit(TableName.SUBSCRIPTION_EVENTS, cancelledRecordId, ChangeType.UPDATE));
 
                     for (final EntitlementEvent cur : uncancelEvents) {
                         transactional.insertEvent(cur, context);
-                        Long recordId = transactional.getRecordId(cur.getId().toString());
+                        final Long recordId = transactional.getRecordId(cur.getId().toString());
                         eventAudits.add(new EntityAudit(TableName.SUBSCRIPTION_EVENTS, recordId, ChangeType.INSERT));
                         recordFutureNotificationFromTransaction(transactional,
-                                cur.getEffectiveDate(),
-                                new EntitlementNotificationKey(cur.getId()));
+                                                                cur.getEffectiveDate(),
+                                                                new EntitlementNotificationKey(cur.getId()));
                     }
 
                     transactional.insertAuditFromTransaction(eventAudits, context);
@@ -399,19 +399,19 @@ public class AuditedEntitlementDao implements EntitlementDao {
     public void changePlan(final UUID subscriptionId, final List<EntitlementEvent> changeEvents, final CallContext context) {
         eventsDao.inTransaction(new Transaction<Void, EntitlementEventSqlDao>() {
             @Override
-            public Void inTransaction(EntitlementEventSqlDao transactional, TransactionStatus status) throws Exception {
+            public Void inTransaction(final EntitlementEventSqlDao transactional, final TransactionStatus status) throws Exception {
                 cancelNextChangeEventFromTransaction(subscriptionId, transactional, context);
                 cancelNextPhaseEventFromTransaction(subscriptionId, transactional, context);
 
-                List<EntityAudit> eventAudits = new ArrayList<EntityAudit>();
+                final List<EntityAudit> eventAudits = new ArrayList<EntityAudit>();
                 for (final EntitlementEvent cur : changeEvents) {
                     transactional.insertEvent(cur, context);
-                    Long recordId = transactional.getRecordId(cur.getId().toString());
+                    final Long recordId = transactional.getRecordId(cur.getId().toString());
                     eventAudits.add(new EntityAudit(TableName.SUBSCRIPTION_EVENTS, recordId, ChangeType.INSERT));
 
                     recordFutureNotificationFromTransaction(transactional,
-                            cur.getEffectiveDate(),
-                            new EntitlementNotificationKey(cur.getId()));
+                                                            cur.getEffectiveDate(),
+                                                            new EntitlementNotificationKey(cur.getId()));
                 }
 
                 transactional.insertAuditFromTransaction(eventAudits, context);
@@ -433,29 +433,29 @@ public class AuditedEntitlementDao implements EntitlementDao {
     }
 
     private void cancelFutureEventFromTransaction(final UUID subscriptionId, final EntitlementEventSqlDao dao,
-            final EventType type, @Nullable final ApiEventType apiType,
-            final CallContext context) {
+                                                  final EventType type, @Nullable final ApiEventType apiType,
+                                                  final CallContext context) {
 
         EntitlementEvent futureEvent = null;
-        Date now = clock.getUTCNow().toDate();
-        List<EntitlementEvent> events = dao.getFutureActiveEventForSubscription(subscriptionId.toString(), now);
-        for (EntitlementEvent cur : events) {
+        final Date now = clock.getUTCNow().toDate();
+        final List<EntitlementEvent> events = dao.getFutureActiveEventForSubscription(subscriptionId.toString(), now);
+        for (final EntitlementEvent cur : events) {
             if (cur.getType() == type &&
-                    (apiType == null || apiType == ((ApiEvent) cur).getEventType() )) {
+                    (apiType == null || apiType == ((ApiEvent) cur).getEventType())) {
                 if (futureEvent != null) {
                     throw new EntitlementError(
                             String.format("Found multiple future events for type %s for subscriptions %s",
-                                    type, subscriptionId.toString()));
+                                          type, subscriptionId.toString()));
                 }
                 futureEvent = cur;
             }
         }
 
         if (futureEvent != null) {
-            String eventId = futureEvent.getId().toString();
+            final String eventId = futureEvent.getId().toString();
             dao.unactiveEvent(eventId, context);
-            Long recordId = dao.getRecordId(eventId);
-            EntityAudit audit = new EntityAudit(TableName.SUBSCRIPTION_EVENTS, recordId, ChangeType.UPDATE);
+            final Long recordId = dao.getRecordId(eventId);
+            final EntityAudit audit = new EntityAudit(TableName.SUBSCRIPTION_EVENTS, recordId, ChangeType.UPDATE);
             dao.insertAuditFromTransaction(audit, context);
         }
     }
@@ -464,16 +464,16 @@ public class AuditedEntitlementDao implements EntitlementDao {
         if (input == null) {
             return null;
         }
-        List<Subscription> bundleInput = new ArrayList<Subscription>();
+        final List<Subscription> bundleInput = new ArrayList<Subscription>();
         if (input.getCategory() == ProductCategory.ADD_ON) {
-            Subscription baseSubscription = getBaseSubscription(factory, input.getBundleId(), false);
+            final Subscription baseSubscription = getBaseSubscription(factory, input.getBundleId(), false);
             bundleInput.add(baseSubscription);
             bundleInput.add(input);
         } else {
             bundleInput.add(input);
         }
-        List<Subscription> reloadedSubscriptions = buildBundleSubscriptions(factory, bundleInput);
-        for (Subscription cur : reloadedSubscriptions) {
+        final List<Subscription> reloadedSubscriptions = buildBundleSubscriptions(factory, bundleInput);
+        for (final Subscription cur : reloadedSubscriptions) {
             if (cur.getId().equals(input.getId())) {
                 return cur;
             }
@@ -485,7 +485,7 @@ public class AuditedEntitlementDao implements EntitlementDao {
         // Make sure BasePlan -- if exists-- is first
         Collections.sort(input, new Comparator<Subscription>() {
             @Override
-            public int compare(Subscription o1, Subscription o2) {
+            public int compare(final Subscription o1, final Subscription o2) {
                 if (o1.getCategory() == ProductCategory.BASE) {
                     return -1;
                 } else if (o2.getCategory() == ProductCategory.BASE) {
@@ -497,53 +497,53 @@ public class AuditedEntitlementDao implements EntitlementDao {
         });
 
         EntitlementEvent futureBaseEvent = null;
-        List<Subscription> result = new ArrayList<Subscription>(input.size());
-        for (Subscription cur : input) {
+        final List<Subscription> result = new ArrayList<Subscription>(input.size());
+        for (final Subscription cur : input) {
 
-            List<EntitlementEvent> events = eventsDao.getEventsForSubscription(cur.getId().toString());
+            final List<EntitlementEvent> events = eventsDao.getEventsForSubscription(cur.getId().toString());
             Subscription reloaded = factory.createSubscription(new SubscriptionBuilder((SubscriptionData) cur), events);
 
             switch (cur.getCategory()) {
-            case BASE:
-                Collection<EntitlementEvent> futureApiEvents = Collections2.filter(events, new Predicate<EntitlementEvent>() {
-                    @Override
-                    public boolean apply(EntitlementEvent input) {
-                        return (input.getEffectiveDate().isAfter(clock.getUTCNow()) &&
-                                ((input instanceof ApiEventCancel) || (input instanceof ApiEventChange)));
-                    }
-                });
-                futureBaseEvent = (futureApiEvents.size() == 0) ? null : futureApiEvents.iterator().next();
-                break;
-
-            case ADD_ON:
-                Plan targetAddOnPlan = reloaded.getCurrentPlan();
-                String baseProductName = (futureBaseEvent instanceof ApiEventChange) ?
-                        ((ApiEventChange) futureBaseEvent).getEventPlan() : null;
-
-                        boolean createCancelEvent = (futureBaseEvent != null) &&
-                        ((futureBaseEvent instanceof ApiEventCancel) ||
-                                ((! addonUtils.isAddonAvailableFromPlanName(baseProductName, futureBaseEvent.getEffectiveDate(), targetAddOnPlan)) ||
-                                        (addonUtils.isAddonIncludedFromPlanName(baseProductName, futureBaseEvent.getEffectiveDate(), targetAddOnPlan))));
-
-                        if (createCancelEvent) {
-                            DateTime now = clock.getUTCNow();
-                            EntitlementEvent addOnCancelEvent = new ApiEventCancel(new ApiEventBuilder()
-                            .setSubscriptionId(reloaded.getId())
-                            .setActiveVersion(((SubscriptionData) reloaded).getActiveVersion())
-                            .setProcessedDate(now)
-                            .setEffectiveDate(futureBaseEvent.getEffectiveDate())
-                            .setRequestedDate(now)
-                            // This event is only there to indicate the ADD_ON is future canceled, but it is not there
-                            // on disk until the base plan cancellation becomes effective
-                            .setFromDisk(false));
-
-                            events.add(addOnCancelEvent);
-                            // Finally reload subscription with full set of events
-                            reloaded = factory.createSubscription(new SubscriptionBuilder((SubscriptionData) cur), events);
+                case BASE:
+                    final Collection<EntitlementEvent> futureApiEvents = Collections2.filter(events, new Predicate<EntitlementEvent>() {
+                        @Override
+                        public boolean apply(final EntitlementEvent input) {
+                            return (input.getEffectiveDate().isAfter(clock.getUTCNow()) &&
+                                    ((input instanceof ApiEventCancel) || (input instanceof ApiEventChange)));
                         }
-                        break;
-            default:
-                break;
+                    });
+                    futureBaseEvent = (futureApiEvents.size() == 0) ? null : futureApiEvents.iterator().next();
+                    break;
+
+                case ADD_ON:
+                    final Plan targetAddOnPlan = reloaded.getCurrentPlan();
+                    final String baseProductName = (futureBaseEvent instanceof ApiEventChange) ?
+                            ((ApiEventChange) futureBaseEvent).getEventPlan() : null;
+
+                    final boolean createCancelEvent = (futureBaseEvent != null) &&
+                            ((futureBaseEvent instanceof ApiEventCancel) ||
+                                    ((!addonUtils.isAddonAvailableFromPlanName(baseProductName, futureBaseEvent.getEffectiveDate(), targetAddOnPlan)) ||
+                                            (addonUtils.isAddonIncludedFromPlanName(baseProductName, futureBaseEvent.getEffectiveDate(), targetAddOnPlan))));
+
+                    if (createCancelEvent) {
+                        final DateTime now = clock.getUTCNow();
+                        final EntitlementEvent addOnCancelEvent = new ApiEventCancel(new ApiEventBuilder()
+                                                                                       .setSubscriptionId(reloaded.getId())
+                                                                                       .setActiveVersion(((SubscriptionData) reloaded).getActiveVersion())
+                                                                                       .setProcessedDate(now)
+                                                                                       .setEffectiveDate(futureBaseEvent.getEffectiveDate())
+                                                                                       .setRequestedDate(now)
+                                                                                               // This event is only there to indicate the ADD_ON is future canceled, but it is not there
+                                                                                               // on disk until the base plan cancellation becomes effective
+                                                                                       .setFromDisk(false));
+
+                        events.add(addOnCancelEvent);
+                        // Finally reload subscription with full set of events
+                        reloaded = factory.createSubscription(new SubscriptionBuilder((SubscriptionData) cur), events);
+                    }
+                    break;
+                default:
+                    break;
             }
 
             result.add(reloaded);
@@ -557,30 +557,30 @@ public class AuditedEntitlementDao implements EntitlementDao {
         eventsDao.inTransaction(new Transaction<Void, EntitlementEventSqlDao>() {
 
             @Override
-            public Void inTransaction(EntitlementEventSqlDao transactional,
-                    TransactionStatus status) throws Exception {
+            public Void inTransaction(final EntitlementEventSqlDao transactional,
+                                      final TransactionStatus status) throws Exception {
 
-                SubscriptionSqlDao transSubDao = transactional.become(SubscriptionSqlDao.class);
-                BundleSqlDao transBundleDao = transactional.become(BundleSqlDao.class);
+                final SubscriptionSqlDao transSubDao = transactional.become(SubscriptionSqlDao.class);
+                final BundleSqlDao transBundleDao = transactional.become(BundleSqlDao.class);
 
-                List<EntityAudit> audits = new ArrayList<EntityAudit>();
+                final List<EntityAudit> audits = new ArrayList<EntityAudit>();
 
                 Long recordId;
 
-                for (BundleMigrationData curBundle : accountData.getData()) {
-                    SubscriptionBundleData bundleData = curBundle.getData();
+                for (final BundleMigrationData curBundle : accountData.getData()) {
+                    final SubscriptionBundleData bundleData = curBundle.getData();
 
-                    for (SubscriptionMigrationData curSubscription : curBundle.getSubscriptions()) {
+                    for (final SubscriptionMigrationData curSubscription : curBundle.getSubscriptions()) {
 
-                        SubscriptionData subData = curSubscription.getData();
+                        final SubscriptionData subData = curSubscription.getData();
                         for (final EntitlementEvent curEvent : curSubscription.getInitialEvents()) {
                             transactional.insertEvent(curEvent, context);
                             recordId = transactional.getRecordId(curEvent.getId().toString());
                             audits.add(new EntityAudit(TableName.SUBSCRIPTION_EVENTS, recordId, ChangeType.INSERT));
 
                             recordFutureNotificationFromTransaction(transactional,
-                                    curEvent.getEffectiveDate(),
-                                    new EntitlementNotificationKey(curEvent.getId()));
+                                                                    curEvent.getEffectiveDate(),
+                                                                    new EntitlementNotificationKey(curEvent.getId()));
                         }
                         transSubDao.insertSubscription(subData, context);
                         recordId = transSubDao.getRecordId(subData.getId().toString());
@@ -603,26 +603,26 @@ public class AuditedEntitlementDao implements EntitlementDao {
         subscriptionsDao.inTransaction(new Transaction<Void, SubscriptionSqlDao>() {
 
             @Override
-            public Void inTransaction(SubscriptionSqlDao transactional,
-                    TransactionStatus status) throws Exception {
+            public Void inTransaction(final SubscriptionSqlDao transactional,
+                                      final TransactionStatus status) throws Exception {
 
-                EntitlementEventSqlDao transEventDao = transactional.become(EntitlementEventSqlDao.class);
+                final EntitlementEventSqlDao transEventDao = transactional.become(EntitlementEventSqlDao.class);
                 for (final SubscriptionDataRepair cur : inRepair) {
                     transactional.updateForRepair(cur.getId().toString(), cur.getActiveVersion(), cur.getStartDate().toDate(), cur.getBundleStartDate().toDate(), context);
-                    for (EntitlementEvent event : cur.getInitialEvents()) {
+                    for (final EntitlementEvent event : cur.getInitialEvents()) {
                         transEventDao.updateVersion(event.getId().toString(), event.getActiveVersion(), context);
                     }
-                    for (EntitlementEvent event : cur.getNewEvents()) {
+                    for (final EntitlementEvent event : cur.getNewEvents()) {
                         transEventDao.insertEvent(event, context);
                         if (event.getEffectiveDate().isAfter(clock.getUTCNow())) {
                             recordFutureNotificationFromTransaction(transactional,
-                                    event.getEffectiveDate(),
-                                    new EntitlementNotificationKey(event.getId()));
+                                                                    event.getEffectiveDate(),
+                                                                    new EntitlementNotificationKey(event.getId()));
                         }
                     }
                 }
                 try {
-                    RepairEntitlementEvent busEvent = new DefaultRepairEntitlementEvent(context.getUserToken(), accountId, bundleId, clock.getUTCNow());
+                    final RepairEntitlementEvent busEvent = new DefaultRepairEntitlementEvent(context.getUserToken(), accountId, bundleId, clock.getUTCNow());
                     eventBus.postFromTransaction(busEvent, transactional);
                 } catch (EventBusException e) {
                     log.warn("Failed to post repair entitlement event for bundle " + bundleId, e);
@@ -632,11 +632,11 @@ public class AuditedEntitlementDao implements EntitlementDao {
         });
     }
 
-    private Subscription getBaseSubscription(final SubscriptionFactory factory, final UUID bundleId, boolean rebuildSubscription) {
-        List<Subscription> subscriptions = subscriptionsDao.getSubscriptionsFromBundleId(bundleId.toString());
-        for (Subscription cur : subscriptions) {
+    private Subscription getBaseSubscription(final SubscriptionFactory factory, final UUID bundleId, final boolean rebuildSubscription) {
+        final List<Subscription> subscriptions = subscriptionsDao.getSubscriptionsFromBundleId(bundleId.toString());
+        for (final Subscription cur : subscriptions) {
             if (cur.getCategory() == ProductCategory.BASE) {
-                return  rebuildSubscription ? buildSubscription(factory, cur) : cur;
+                return rebuildSubscription ? buildSubscription(factory, cur) : cur;
             }
         }
         return null;
@@ -644,8 +644,8 @@ public class AuditedEntitlementDao implements EntitlementDao {
 
     private void recordFutureNotificationFromTransaction(final Transmogrifier transactionalDao, final DateTime effectiveDate, final NotificationKey notificationKey) {
         try {
-            NotificationQueue subscriptionEventQueue = notificationQueueService.getNotificationQueue(Engine.ENTITLEMENT_SERVICE_NAME,
-                    Engine.NOTIFICATION_QUEUE_NAME);
+            final NotificationQueue subscriptionEventQueue = notificationQueueService.getNotificationQueue(Engine.ENTITLEMENT_SERVICE_NAME,
+                                                                                                     Engine.NOTIFICATION_QUEUE_NAME);
             subscriptionEventQueue.recordFutureNotificationFromTransaction(transactionalDao, effectiveDate, notificationKey);
         } catch (NoSuchNotificationQueue e) {
             throw new RuntimeException(e);

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/BundleSqlDao.java b/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/BundleSqlDao.java
index b6becbb..3530c28 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/BundleSqlDao.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/BundleSqlDao.java
@@ -22,8 +22,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 
-import com.ning.billing.util.dao.AuditSqlDao;
-import com.ning.billing.util.entity.dao.EntitySqlDao;
 import org.joda.time.DateTime;
 import org.skife.jdbi.v2.SQLStatement;
 import org.skife.jdbi.v2.StatementContext;
@@ -42,13 +40,15 @@ import com.ning.billing.entitlement.api.user.SubscriptionBundle;
 import com.ning.billing.entitlement.api.user.SubscriptionBundleData;
 import com.ning.billing.util.callcontext.CallContext;
 import com.ning.billing.util.callcontext.CallContextBinder;
+import com.ning.billing.util.dao.AuditSqlDao;
 import com.ning.billing.util.dao.BinderBase;
 import com.ning.billing.util.dao.MapperBase;
+import com.ning.billing.util.entity.dao.EntitySqlDao;
 
 
 @ExternalizedSqlViaStringTemplate3()
 public interface BundleSqlDao extends Transactional<BundleSqlDao>, EntitySqlDao<SubscriptionBundle>,
-                                      AuditSqlDao, CloseMe, Transmogrifier {
+        AuditSqlDao, CloseMe, Transmogrifier {
 
     @SqlUpdate
     public void insertBundle(@Bind(binder = SubscriptionBundleBinder.class) SubscriptionBundleData bundle,
@@ -56,7 +56,7 @@ public interface BundleSqlDao extends Transactional<BundleSqlDao>, EntitySqlDao<
 
     @SqlUpdate
     public void updateBundleLastSysTime(@Bind("id") String id, @Bind("lastSysUpdateDate") Date lastSysUpdate);
-    
+
     @SqlQuery
     @Mapper(ISubscriptionBundleSqlMapper.class)
     public SubscriptionBundle getBundleFromId(@Bind("id") String id);
@@ -71,7 +71,7 @@ public interface BundleSqlDao extends Transactional<BundleSqlDao>, EntitySqlDao<
 
     public static class SubscriptionBundleBinder extends BinderBase implements Binder<Bind, SubscriptionBundleData> {
         @Override
-        public void bind(@SuppressWarnings("rawtypes") SQLStatement stmt, Bind bind, SubscriptionBundleData bundle) {
+        public void bind(@SuppressWarnings("rawtypes") final SQLStatement stmt, final Bind bind, final SubscriptionBundleData bundle) {
             stmt.bind("id", bundle.getId().toString());
             stmt.bind("startDate", getDate(bundle.getStartDate()));
             stmt.bind("externalKey", bundle.getKey());
@@ -81,16 +81,16 @@ public interface BundleSqlDao extends Transactional<BundleSqlDao>, EntitySqlDao<
     }
 
     public static class ISubscriptionBundleSqlMapper extends MapperBase implements ResultSetMapper<SubscriptionBundle> {
-        
+
         @Override
-        public SubscriptionBundle map(int arg, ResultSet r,
-                StatementContext ctx) throws SQLException {
-            UUID id = UUID.fromString(r.getString("id"));
-            String key = r.getString("external_key");
-            UUID accountId = UUID.fromString(r.getString("account_id"));
-            DateTime startDate = getDate(r, "start_date");
-            DateTime lastSysUpdateDate = getDate(r, "last_sys_update_date");
-            SubscriptionBundleData bundle = new SubscriptionBundleData(id, key, accountId, startDate, lastSysUpdateDate);
+        public SubscriptionBundle map(final int arg, final ResultSet r,
+                                      final StatementContext ctx) throws SQLException {
+            final UUID id = UUID.fromString(r.getString("id"));
+            final String key = r.getString("external_key");
+            final UUID accountId = UUID.fromString(r.getString("account_id"));
+            final DateTime startDate = getDate(r, "start_date");
+            final DateTime lastSysUpdateDate = getDate(r, "last_sys_update_date");
+            final SubscriptionBundleData bundle = new SubscriptionBundleData(id, key, accountId, startDate, lastSysUpdateDate);
             return bundle;
         }
     }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EntitlementDao.java b/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EntitlementDao.java
index 97270ba..710391b 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EntitlementDao.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EntitlementDao.java
@@ -20,8 +20,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import com.ning.billing.util.callcontext.CallContext;
-
 import com.ning.billing.entitlement.api.SubscriptionFactory;
 import com.ning.billing.entitlement.api.migration.AccountMigrationData;
 import com.ning.billing.entitlement.api.timeline.SubscriptionDataRepair;
@@ -30,6 +28,7 @@ import com.ning.billing.entitlement.api.user.SubscriptionBundle;
 import com.ning.billing.entitlement.api.user.SubscriptionBundleData;
 import com.ning.billing.entitlement.api.user.SubscriptionData;
 import com.ning.billing.entitlement.events.EntitlementEvent;
+import com.ning.billing.util.callcontext.CallContext;
 
 public interface EntitlementDao {
     // Bundle apis
@@ -62,7 +61,7 @@ public interface EntitlementDao {
     public EntitlementEvent getEventById(final UUID eventId);
 
     public Map<UUID, List<EntitlementEvent>> getEventsForBundle(final UUID bundleId);
-    
+
     public List<EntitlementEvent> getEventsForSubscription(final UUID subscriptionId);
 
     public List<EntitlementEvent> getPendingEventsForSubscription(final UUID subscriptionId);
@@ -73,7 +72,7 @@ public interface EntitlementDao {
     public void recreateSubscription(final UUID subscriptionId, final List<EntitlementEvent> recreateEvents, final CallContext context);
 
     public void cancelSubscription(final UUID subscriptionId, final EntitlementEvent cancelEvent, final CallContext context, final int cancelSeq);
-    
+
     public void uncancelSubscription(final UUID subscriptionId, final List<EntitlementEvent> uncancelEvents, final CallContext context);
 
     public void changePlan(final UUID subscriptionId, final List<EntitlementEvent> changeEvents, final CallContext context);

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EntitlementEventSqlDao.java b/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EntitlementEventSqlDao.java
index 124aee1..bc4bd1e 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EntitlementEventSqlDao.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EntitlementEventSqlDao.java
@@ -16,20 +16,12 @@
 
 package com.ning.billing.entitlement.engine.dao;
 
-import com.ning.billing.entitlement.events.EntitlementEvent;
-import com.ning.billing.entitlement.events.EntitlementEvent.EventType;
-import com.ning.billing.entitlement.events.EventBaseBuilder;
-import com.ning.billing.entitlement.events.phase.PhaseEvent;
-import com.ning.billing.entitlement.events.phase.PhaseEventBuilder;
-import com.ning.billing.entitlement.events.phase.PhaseEventData;
-import com.ning.billing.entitlement.events.user.*;
-import com.ning.billing.entitlement.exceptions.EntitlementError;
-import com.ning.billing.util.dao.AuditSqlDao;
-import com.ning.billing.util.callcontext.CallContext;
-import com.ning.billing.util.callcontext.CallContextBinder;
-import com.ning.billing.util.dao.BinderBase;
-import com.ning.billing.util.dao.MapperBase;
-import com.ning.billing.util.entity.dao.EntitySqlDao;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
 import org.joda.time.DateTime;
 import org.skife.jdbi.v2.SQLStatement;
 import org.skife.jdbi.v2.StatementContext;
@@ -43,15 +35,34 @@ import org.skife.jdbi.v2.sqlobject.mixins.Transactional;
 import org.skife.jdbi.v2.sqlobject.mixins.Transmogrifier;
 import org.skife.jdbi.v2.sqlobject.stringtemplate.ExternalizedSqlViaStringTemplate3;
 import org.skife.jdbi.v2.tweak.ResultSetMapper;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+
+import com.ning.billing.entitlement.events.EntitlementEvent;
+import com.ning.billing.entitlement.events.EntitlementEvent.EventType;
+import com.ning.billing.entitlement.events.EventBaseBuilder;
+import com.ning.billing.entitlement.events.phase.PhaseEvent;
+import com.ning.billing.entitlement.events.phase.PhaseEventBuilder;
+import com.ning.billing.entitlement.events.phase.PhaseEventData;
+import com.ning.billing.entitlement.events.user.ApiEvent;
+import com.ning.billing.entitlement.events.user.ApiEventBuilder;
+import com.ning.billing.entitlement.events.user.ApiEventCancel;
+import com.ning.billing.entitlement.events.user.ApiEventChange;
+import com.ning.billing.entitlement.events.user.ApiEventCreate;
+import com.ning.billing.entitlement.events.user.ApiEventMigrateBilling;
+import com.ning.billing.entitlement.events.user.ApiEventMigrateEntitlement;
+import com.ning.billing.entitlement.events.user.ApiEventReCreate;
+import com.ning.billing.entitlement.events.user.ApiEventType;
+import com.ning.billing.entitlement.events.user.ApiEventUncancel;
+import com.ning.billing.entitlement.exceptions.EntitlementError;
+import com.ning.billing.util.callcontext.CallContext;
+import com.ning.billing.util.callcontext.CallContextBinder;
+import com.ning.billing.util.dao.AuditSqlDao;
+import com.ning.billing.util.dao.BinderBase;
+import com.ning.billing.util.dao.MapperBase;
+import com.ning.billing.util.entity.dao.EntitySqlDao;
 
 @ExternalizedSqlViaStringTemplate3()
 public interface EntitlementEventSqlDao extends Transactional<EntitlementEventSqlDao>, AuditSqlDao,
-                                                 EntitySqlDao<EntitlementEvent>, CloseMe, Transmogrifier  {
+        EntitySqlDao<EntitlementEvent>, CloseMe, Transmogrifier {
 
     @SqlQuery
     @Mapper(EventSqlMapper.class)
@@ -62,18 +73,18 @@ public interface EntitlementEventSqlDao extends Transactional<EntitlementEventSq
                             @CallContextBinder final CallContext context);
 
     @SqlUpdate
-    public void unactiveEvent(@Bind("id")String id,
+    public void unactiveEvent(@Bind("id") String id,
                               @CallContextBinder final CallContext context);
 
     @SqlUpdate
-    public void reactiveEvent(@Bind("id")String id,
+    public void reactiveEvent(@Bind("id") String id,
                               @CallContextBinder final CallContext context);
 
     @SqlUpdate
-    public void updateVersion(@Bind("id")String id,
+    public void updateVersion(@Bind("id") String id,
                               @Bind("currentVersion") Long currentVersion,
                               @CallContextBinder final CallContext context);
-    
+
     @SqlQuery
     @Mapper(EventSqlMapper.class)
     public List<EntitlementEvent> getFutureActiveEventForSubscription(@Bind("subscriptionId") String subscriptionId, @Bind("now") Date now);
@@ -84,21 +95,21 @@ public interface EntitlementEventSqlDao extends Transactional<EntitlementEventSq
 
     public static class EventSqlDaoBinder extends BinderBase implements Binder<Bind, EntitlementEvent> {
         @Override
-        public void bind(@SuppressWarnings("rawtypes") SQLStatement stmt, Bind bind, EntitlementEvent evt) {
-        	
-        	String planName = null;
-        	String phaseName = null;
-        	String priceListName = null;
-        	String userType = null;
-        	if (evt.getType() == EventType.API_USER) {
-        		ApiEvent userEvent = (ApiEvent) evt;
-            	planName = userEvent.getEventPlan();
-            	phaseName = userEvent.getEventPlanPhase();
-            	priceListName = userEvent.getPriceList();
-            	userType = userEvent.getEventType().toString();
-        	} else {
-        		phaseName = ((PhaseEvent) evt).getPhase();
-        	}
+        public void bind(@SuppressWarnings("rawtypes") final SQLStatement stmt, final Bind bind, final EntitlementEvent evt) {
+
+            String planName = null;
+            String phaseName = null;
+            String priceListName = null;
+            String userType = null;
+            if (evt.getType() == EventType.API_USER) {
+                final ApiEvent userEvent = (ApiEvent) evt;
+                planName = userEvent.getEventPlan();
+                phaseName = userEvent.getEventPlanPhase();
+                priceListName = userEvent.getPriceList();
+                userType = userEvent.getEventType().toString();
+            } else {
+                phaseName = ((PhaseEvent) evt).getPhase();
+            }
             stmt.bind("id", evt.getId().toString());
             stmt.bind("eventType", evt.getType().toString());
             stmt.bind("userType", userType);
@@ -115,47 +126,47 @@ public interface EntitlementEventSqlDao extends Transactional<EntitlementEventSq
 
     public static class EventSqlMapper extends MapperBase implements ResultSetMapper<EntitlementEvent> {
         @Override
-        public EntitlementEvent map(int index, ResultSet r, StatementContext ctx)
-        throws SQLException {
-
-            long totalOrdering = r.getLong("record_id");
-            UUID id = UUID.fromString(r.getString("id"));
-            EventType eventType = EventType.valueOf(r.getString("event_type"));
-            ApiEventType userType = (eventType == EventType.API_USER) ? ApiEventType.valueOf(r.getString("user_type")) : null;
-            DateTime createdDate = getDate(r, "created_date");
-            DateTime requestedDate = getDate(r, "requested_date");
-            DateTime effectiveDate = getDate(r, "effective_date");
-            UUID subscriptionId = UUID.fromString(r.getString("subscription_id"));
-            String planName = r.getString("plan_name");
-            String phaseName = r.getString("phase_name");
-            String priceListName = r.getString("price_list_name");
-            long currentVersion = r.getLong("current_version");
-            boolean isActive = r.getBoolean("is_active");
-            UUID userToken = r.getString("user_token") != null ? UUID.fromString(r.getString("user_token")) : null;
-            
-            EventBaseBuilder<?> base = ((eventType == EventType.PHASE) ?
+        public EntitlementEvent map(final int index, final ResultSet r, final StatementContext ctx)
+                throws SQLException {
+
+            final long totalOrdering = r.getLong("record_id");
+            final UUID id = UUID.fromString(r.getString("id"));
+            final EventType eventType = EventType.valueOf(r.getString("event_type"));
+            final ApiEventType userType = (eventType == EventType.API_USER) ? ApiEventType.valueOf(r.getString("user_type")) : null;
+            final DateTime createdDate = getDate(r, "created_date");
+            final DateTime requestedDate = getDate(r, "requested_date");
+            final DateTime effectiveDate = getDate(r, "effective_date");
+            final UUID subscriptionId = UUID.fromString(r.getString("subscription_id"));
+            final String planName = r.getString("plan_name");
+            final String phaseName = r.getString("phase_name");
+            final String priceListName = r.getString("price_list_name");
+            final long currentVersion = r.getLong("current_version");
+            final boolean isActive = r.getBoolean("is_active");
+            final UUID userToken = r.getString("user_token") != null ? UUID.fromString(r.getString("user_token")) : null;
+
+            final EventBaseBuilder<?> base = ((eventType == EventType.PHASE) ?
                     new PhaseEventBuilder() :
-                        new ApiEventBuilder())
-                        .setTotalOrdering(totalOrdering)
-                        .setUuid(id)
-                        .setSubscriptionId(subscriptionId)
-                        .setRequestedDate(requestedDate)
-                        .setEffectiveDate(effectiveDate)
-                        .setProcessedDate(createdDate)
-                        .setActiveVersion(currentVersion)
-                        .setActive(isActive);
+                    new ApiEventBuilder())
+                    .setTotalOrdering(totalOrdering)
+                    .setUuid(id)
+                    .setSubscriptionId(subscriptionId)
+                    .setRequestedDate(requestedDate)
+                    .setEffectiveDate(effectiveDate)
+                    .setProcessedDate(createdDate)
+                    .setActiveVersion(currentVersion)
+                    .setActive(isActive);
 
             EntitlementEvent result = null;
             if (eventType == EventType.PHASE) {
                 result = new PhaseEventData(new PhaseEventBuilder(base).setPhaseName(phaseName));
             } else if (eventType == EventType.API_USER) {
-                ApiEventBuilder builder = new ApiEventBuilder(base)
-                    .setEventPlan(planName)
-                    .setEventPlanPhase(phaseName)
-                    .setEventPriceList(priceListName)
-                    .setEventType(userType)
-                    .setUserToken(userToken)
-                    .setFromDisk(true);
+                final ApiEventBuilder builder = new ApiEventBuilder(base)
+                        .setEventPlan(planName)
+                        .setEventPlanPhase(phaseName)
+                        .setEventPriceList(priceListName)
+                        .setEventType(userType)
+                        .setUserToken(userToken)
+                        .setFromDisk(true);
 
                 if (userType == ApiEventType.CREATE) {
                     result = new ApiEventCreate(builder);

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/RepairEntitlementDao.java b/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/RepairEntitlementDao.java
index b2a10ac..d6f3fe9 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/RepairEntitlementDao.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/RepairEntitlementDao.java
@@ -40,15 +40,15 @@ import com.ning.billing.util.callcontext.CallContext;
 public class RepairEntitlementDao implements EntitlementDao, RepairEntitlementLifecycleDao {
 
     private final ThreadLocal<Map<UUID, SubscriptionRepairEvent>> preThreadsInRepairSubscriptions = new ThreadLocal<Map<UUID, SubscriptionRepairEvent>>();
-    
-    private final static class SubscriptionRepairEvent {
-        
+
+    private static final class SubscriptionRepairEvent {
+
         private final Set<EntitlementEvent> events;
-        
-        public SubscriptionRepairEvent(List<EntitlementEvent> initialEvents) {
+
+        public SubscriptionRepairEvent(final List<EntitlementEvent> initialEvents) {
             events = new TreeSet<EntitlementEvent>(new Comparator<EntitlementEvent>() {
                 @Override
-                public int compare(EntitlementEvent o1, EntitlementEvent o2) {
+                public int compare(final EntitlementEvent o1, final EntitlementEvent o2) {
                     return o1.compareTo(o2);
                 }
             });
@@ -56,74 +56,74 @@ public class RepairEntitlementDao implements EntitlementDao, RepairEntitlementLi
                 events.addAll(initialEvents);
             }
         }
-        
+
         public Set<EntitlementEvent> getEvents() {
             return events;
         }
-        
-        public void addEvents(List<EntitlementEvent> newEvents) {
+
+        public void addEvents(final List<EntitlementEvent> newEvents) {
             events.addAll(newEvents);
         }
     }
-    
+
     private Map<UUID, SubscriptionRepairEvent> getRepairMap() {
         if (preThreadsInRepairSubscriptions.get() == null) {
             preThreadsInRepairSubscriptions.set(new HashMap<UUID, SubscriptionRepairEvent>());
         }
         return preThreadsInRepairSubscriptions.get();
     }
-    
-    private SubscriptionRepairEvent getRepairSubscriptionEvents(UUID subscriptionId) {
-        Map<UUID, SubscriptionRepairEvent> map = getRepairMap();
+
+    private SubscriptionRepairEvent getRepairSubscriptionEvents(final UUID subscriptionId) {
+        final Map<UUID, SubscriptionRepairEvent> map = getRepairMap();
         return map.get(subscriptionId);
     }
-    
+
     @Override
-    public List<EntitlementEvent> getEventsForSubscription(UUID subscriptionId) {
-        SubscriptionRepairEvent target =  getRepairSubscriptionEvents(subscriptionId);
+    public List<EntitlementEvent> getEventsForSubscription(final UUID subscriptionId) {
+        final SubscriptionRepairEvent target = getRepairSubscriptionEvents(subscriptionId);
         return new LinkedList<EntitlementEvent>(target.getEvents());
     }
 
     @Override
-    public void createSubscription(SubscriptionData subscription,
-            List<EntitlementEvent> createEvents, CallContext context) {
+    public void createSubscription(final SubscriptionData subscription,
+                                   final List<EntitlementEvent> createEvents, final CallContext context) {
         addEvents(subscription.getId(), createEvents);
     }
 
     @Override
-    public void recreateSubscription(UUID subscriptionId,
-            List<EntitlementEvent> recreateEvents, CallContext context) {
+    public void recreateSubscription(final UUID subscriptionId,
+                                     final List<EntitlementEvent> recreateEvents, final CallContext context) {
         addEvents(subscriptionId, recreateEvents);
     }
 
     @Override
-    public void cancelSubscription(UUID subscriptionId,
-            EntitlementEvent cancelEvent, CallContext context, int cancelSeq) {
-        long activeVersion = cancelEvent.getActiveVersion();
+    public void cancelSubscription(final UUID subscriptionId,
+                                   final EntitlementEvent cancelEvent, final CallContext context, final int cancelSeq) {
+        final long activeVersion = cancelEvent.getActiveVersion();
         addEvents(subscriptionId, Collections.singletonList(cancelEvent));
-        SubscriptionRepairEvent target =  getRepairSubscriptionEvents(subscriptionId);
+        final SubscriptionRepairEvent target = getRepairSubscriptionEvents(subscriptionId);
         boolean foundCancelEvent = false;
-        for (EntitlementEvent cur : target.getEvents()) {
+        for (final EntitlementEvent cur : target.getEvents()) {
             if (cur.getId().equals(cancelEvent.getId())) {
                 foundCancelEvent = true;
-            } else if (foundCancelEvent) { 
+            } else if (foundCancelEvent) {
                 cur.setActiveVersion(activeVersion - 1);
             }
         }
     }
 
-    
+
     @Override
-    public void changePlan(UUID subscriptionId,
-            List<EntitlementEvent> changeEvents, CallContext context) {
-        addEvents(subscriptionId, changeEvents);        
+    public void changePlan(final UUID subscriptionId,
+                           final List<EntitlementEvent> changeEvents, final CallContext context) {
+        addEvents(subscriptionId, changeEvents);
     }
 
     @Override
-    public void initializeRepair(UUID subscriptionId, List<EntitlementEvent> initialEvents) {
-        Map<UUID, SubscriptionRepairEvent> map = getRepairMap();
+    public void initializeRepair(final UUID subscriptionId, final List<EntitlementEvent> initialEvents) {
+        final Map<UUID, SubscriptionRepairEvent> map = getRepairMap();
         if (map.get(subscriptionId) == null) {
-            SubscriptionRepairEvent value = new SubscriptionRepairEvent(initialEvents);
+            final SubscriptionRepairEvent value = new SubscriptionRepairEvent(initialEvents);
             map.put(subscriptionId, value);
         } else {
             throw new EntitlementError(String.format("Unexpected SubscriptionRepairEvent %s for thread %s", subscriptionId, Thread.currentThread().getName()));
@@ -132,112 +132,112 @@ public class RepairEntitlementDao implements EntitlementDao, RepairEntitlementLi
 
     @Override
     public void cleanup() {
-        Map<UUID, SubscriptionRepairEvent> map = getRepairMap();
+        final Map<UUID, SubscriptionRepairEvent> map = getRepairMap();
         map.clear();
     }
 
-    
-    private void addEvents(UUID subscriptionId, List<EntitlementEvent> events) {
-        SubscriptionRepairEvent target =  getRepairSubscriptionEvents(subscriptionId);
-        target.addEvents(events);        
+
+    private void addEvents(final UUID subscriptionId, final List<EntitlementEvent> events) {
+        final SubscriptionRepairEvent target = getRepairSubscriptionEvents(subscriptionId);
+        target.addEvents(events);
     }
 
-    
+
     @Override
-    public void uncancelSubscription(UUID subscriptionId,
-            List<EntitlementEvent> uncancelEvents, CallContext context) {
-        throw new EntitlementError("Not implemented");        
+    public void uncancelSubscription(final UUID subscriptionId,
+                                     final List<EntitlementEvent> uncancelEvents, final CallContext context) {
+        throw new EntitlementError("Not implemented");
     }
-    
+
     @Override
-    public List<SubscriptionBundle> getSubscriptionBundleForAccount(UUID accountId) {
+    public List<SubscriptionBundle> getSubscriptionBundleForAccount(final UUID accountId) {
         throw new EntitlementError("Not implemented");
     }
 
     @Override
-    public SubscriptionBundle getSubscriptionBundleFromKey(String bundleKey) {
+    public SubscriptionBundle getSubscriptionBundleFromKey(final String bundleKey) {
         throw new EntitlementError("Not implemented");
     }
 
     @Override
-    public SubscriptionBundle getSubscriptionBundleFromId(UUID bundleId) {
+    public SubscriptionBundle getSubscriptionBundleFromId(final UUID bundleId) {
         throw new EntitlementError("Not implemented");
     }
 
     @Override
     public SubscriptionBundle createSubscriptionBundle(
-            SubscriptionBundleData bundle, CallContext context) {
+            final SubscriptionBundleData bundle, final CallContext context) {
         throw new EntitlementError("Not implemented");
     }
 
     @Override
-    public Subscription getSubscriptionFromId(SubscriptionFactory factory,
-            UUID subscriptionId) {
+    public Subscription getSubscriptionFromId(final SubscriptionFactory factory,
+                                              final UUID subscriptionId) {
         throw new EntitlementError("Not implemented");
     }
 
     @Override
-    public UUID getAccountIdFromSubscriptionId(UUID subscriptionId) {
+    public UUID getAccountIdFromSubscriptionId(final UUID subscriptionId) {
         throw new EntitlementError("Not implemented");
     }
 
     @Override
-    public Subscription getBaseSubscription(SubscriptionFactory factory,
-            UUID bundleId) {
+    public Subscription getBaseSubscription(final SubscriptionFactory factory,
+                                            final UUID bundleId) {
         throw new EntitlementError("Not implemented");
     }
 
     @Override
-    public List<Subscription> getSubscriptions(SubscriptionFactory factory,
-            UUID bundleId) {
+    public List<Subscription> getSubscriptions(final SubscriptionFactory factory,
+                                               final UUID bundleId) {
         throw new EntitlementError("Not implemented");
     }
 
     @Override
     public List<Subscription> getSubscriptionsForKey(
-            SubscriptionFactory factory, String bundleKey) {
+            final SubscriptionFactory factory, final String bundleKey) {
         throw new EntitlementError("Not implemented");
     }
 
     @Override
-    public void updateChargedThroughDate(SubscriptionData subscription,
-            CallContext context) {
+    public void updateChargedThroughDate(final SubscriptionData subscription,
+                                         final CallContext context) {
         throw new EntitlementError("Not implemented");
     }
 
     @Override
-    public void createNextPhaseEvent(UUID subscriptionId,
-            EntitlementEvent nextPhase, CallContext context) {
+    public void createNextPhaseEvent(final UUID subscriptionId,
+                                     final EntitlementEvent nextPhase, final CallContext context) {
         throw new EntitlementError("Not implemented");
     }
 
     @Override
-    public EntitlementEvent getEventById(UUID eventId) {
+    public EntitlementEvent getEventById(final UUID eventId) {
         throw new EntitlementError("Not implemented");
     }
 
     @Override
-    public Map<UUID, List<EntitlementEvent>> getEventsForBundle(UUID bundleId) {
+    public Map<UUID, List<EntitlementEvent>> getEventsForBundle(final UUID bundleId) {
         throw new EntitlementError("Not implemented");
     }
 
 
     @Override
     public List<EntitlementEvent> getPendingEventsForSubscription(
-            UUID subscriptionId) {
+            final UUID subscriptionId) {
         throw new EntitlementError("Not implemented");
     }
 
 
     @Override
-    public void migrate(UUID accountId, AccountMigrationData data,
-            CallContext context) {
+    public void migrate(final UUID accountId, final AccountMigrationData data,
+                        final CallContext context) {
         throw new EntitlementError("Not implemented");
     }
 
     @Override
-    public void repair(UUID accountId, UUID bundleId, List<SubscriptionDataRepair> inRepair,
-            CallContext context) {
+    public void repair(final UUID accountId, final UUID bundleId, final List<SubscriptionDataRepair> inRepair,
+                       final CallContext context) {
         throw new EntitlementError("Not implemented");
     }
 }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/SubscriptionSqlDao.java b/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/SubscriptionSqlDao.java
index a43117d..07c72c0 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/SubscriptionSqlDao.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/SubscriptionSqlDao.java
@@ -16,15 +16,12 @@
 
 package com.ning.billing.entitlement.engine.dao;
 
-import com.ning.billing.catalog.api.ProductCategory;
-import com.ning.billing.entitlement.api.user.Subscription;
-import com.ning.billing.entitlement.api.user.SubscriptionData;
-import com.ning.billing.entitlement.api.user.DefaultSubscriptionFactory.SubscriptionBuilder;
-import com.ning.billing.util.dao.AuditSqlDao;
-import com.ning.billing.util.callcontext.CallContext;
-import com.ning.billing.util.callcontext.CallContextBinder;
-import com.ning.billing.util.dao.BinderBase;
-import com.ning.billing.util.dao.MapperBase;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
 import org.joda.time.DateTime;
 import org.skife.jdbi.v2.SQLStatement;
 import org.skife.jdbi.v2.StatementContext;
@@ -39,15 +36,19 @@ import org.skife.jdbi.v2.sqlobject.mixins.Transmogrifier;
 import org.skife.jdbi.v2.sqlobject.stringtemplate.ExternalizedSqlViaStringTemplate3;
 import org.skife.jdbi.v2.tweak.ResultSetMapper;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import com.ning.billing.catalog.api.ProductCategory;
+import com.ning.billing.entitlement.api.user.DefaultSubscriptionFactory.SubscriptionBuilder;
+import com.ning.billing.entitlement.api.user.Subscription;
+import com.ning.billing.entitlement.api.user.SubscriptionData;
+import com.ning.billing.util.callcontext.CallContext;
+import com.ning.billing.util.callcontext.CallContextBinder;
+import com.ning.billing.util.dao.AuditSqlDao;
+import com.ning.billing.util.dao.BinderBase;
+import com.ning.billing.util.dao.MapperBase;
 
 @ExternalizedSqlViaStringTemplate3()
 public interface SubscriptionSqlDao extends Transactional<SubscriptionSqlDao>, AuditSqlDao, CloseMe, Transmogrifier {
-	@SqlUpdate
+    @SqlUpdate
     public void insertSubscription(@Bind(binder = SubscriptionBinder.class) SubscriptionData sub,
                                    @CallContextBinder final CallContext context);
 
@@ -61,20 +62,21 @@ public interface SubscriptionSqlDao extends Transactional<SubscriptionSqlDao>, A
 
     @SqlUpdate
     public void updateChargedThroughDate(@Bind("id") String id, @Bind("chargedThroughDate") Date chargedThroughDate,
-                                        @CallContextBinder final CallContext context);
+                                         @CallContextBinder final CallContext context);
+
+    @SqlUpdate
+    void updateActiveVersion(@Bind("id") String id, @Bind("activeVersion") long activeVersion,
+                             @CallContextBinder final CallContext context);
 
-    @SqlUpdate void updateActiveVersion(@Bind("id") String id, @Bind("activeVersion") long activeVersion,
-            @CallContextBinder final CallContext context);
-    
     @SqlUpdate
     public void updateForRepair(@Bind("id") String id, @Bind("activeVersion") long activeVersion,
-            @Bind("startDate") Date startDate,
-            @Bind("bundleStartDate") Date bundleStartDate,
-            @CallContextBinder final CallContext context);
+                                @Bind("startDate") Date startDate,
+                                @Bind("bundleStartDate") Date bundleStartDate,
+                                @CallContextBinder final CallContext context);
 
     public static class SubscriptionBinder extends BinderBase implements Binder<Bind, SubscriptionData> {
         @Override
-        public void bind(@SuppressWarnings("rawtypes") SQLStatement stmt, Bind bind, SubscriptionData sub) {
+        public void bind(@SuppressWarnings("rawtypes") final SQLStatement stmt, final Bind bind, final SubscriptionData sub) {
             stmt.bind("id", sub.getId().toString());
             stmt.bind("bundleId", sub.getBundleId().toString());
             stmt.bind("category", sub.getCategory().toString());
@@ -88,27 +90,27 @@ public interface SubscriptionSqlDao extends Transactional<SubscriptionSqlDao>, A
 
     public static class SubscriptionMapper extends MapperBase implements ResultSetMapper<SubscriptionData> {
         @Override
-        public SubscriptionData map(int arg0, ResultSet r, StatementContext ctx)
+        public SubscriptionData map(final int arg0, final ResultSet r, final StatementContext ctx)
                 throws SQLException {
 
-            UUID id = UUID.fromString(r.getString("id"));
-            UUID bundleId = UUID.fromString(r.getString("bundle_id"));
-            ProductCategory category = ProductCategory.valueOf(r.getString("category"));
-            DateTime bundleStartDate = getDate(r, "bundle_start_date");
-            DateTime startDate = getDate(r, "start_date");
-            DateTime ctd = getDate(r, "charged_through_date");
-            DateTime ptd = getDate(r, "paid_through_date");
-            long activeVersion = r.getLong("active_version");
+            final UUID id = UUID.fromString(r.getString("id"));
+            final UUID bundleId = UUID.fromString(r.getString("bundle_id"));
+            final ProductCategory category = ProductCategory.valueOf(r.getString("category"));
+            final DateTime bundleStartDate = getDate(r, "bundle_start_date");
+            final DateTime startDate = getDate(r, "start_date");
+            final DateTime ctd = getDate(r, "charged_through_date");
+            final DateTime ptd = getDate(r, "paid_through_date");
+            final long activeVersion = r.getLong("active_version");
 
             return new SubscriptionData(new SubscriptionBuilder()
-            .setId(id)
-            .setBundleId(bundleId)
-            .setCategory(category)
-            .setBundleStartDate(bundleStartDate)
-            .setStartDate(startDate)
-            .setActiveVersion(activeVersion)
-            .setChargedThroughDate(ctd)
-            .setPaidThroughDate(ptd));
+                                                .setId(id)
+                                                .setBundleId(bundleId)
+                                                .setCategory(category)
+                                                .setBundleStartDate(bundleStartDate)
+                                                .setStartDate(startDate)
+                                                .setActiveVersion(activeVersion)
+                                                .setChargedThroughDate(ctd)
+                                                .setPaidThroughDate(ptd));
         }
     }
 }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/events/EntitlementEvent.java b/entitlement/src/main/java/com/ning/billing/entitlement/events/EntitlementEvent.java
index 8e7688b..6698dfb 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/events/EntitlementEvent.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/events/EntitlementEvent.java
@@ -16,10 +16,11 @@
 
 package com.ning.billing.entitlement.events;
 
-import com.ning.billing.util.entity.Entity;
+import java.util.UUID;
+
 import org.joda.time.DateTime;
 
-import java.util.UUID;
+import com.ning.billing.util.entity.Entity;
 
 
 public interface EntitlementEvent extends Comparable<EntitlementEvent>, Entity {

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/events/EventBase.java b/entitlement/src/main/java/com/ning/billing/entitlement/events/EventBase.java
index 4afc75d..ed1a0db 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/events/EventBase.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/events/EventBase.java
@@ -16,10 +16,11 @@
 
 package com.ning.billing.entitlement.events;
 
-import com.ning.billing.entitlement.events.user.ApiEvent;
+import java.util.UUID;
+
 import org.joda.time.DateTime;
 
-import java.util.UUID;
+import com.ning.billing.entitlement.events.user.ApiEvent;
 
 public abstract class EventBase implements EntitlementEvent {
 
@@ -33,7 +34,7 @@ public abstract class EventBase implements EntitlementEvent {
     private long activeVersion;
     private boolean isActive;
 
-    public EventBase(EventBaseBuilder<?> builder) {
+    public EventBase(final EventBaseBuilder<?> builder) {
         this.totalOrdering = builder.getTotalOrdering();
         this.uuid = builder.getUuid();
         this.subscriptionId = builder.getSubscriptionId();
@@ -102,7 +103,7 @@ public abstract class EventBase implements EntitlementEvent {
     }
 
     @Override
-    public void setActiveVersion(long activeVersion) {
+    public void setActiveVersion(final long activeVersion) {
         this.activeVersion = activeVersion;
     }
 
@@ -122,7 +123,6 @@ public abstract class EventBase implements EntitlementEvent {
     }
 
 
-
     //
     // Really used for unit tests only as the sql implementation relies on date first and then event insertion
     //
@@ -133,7 +133,7 @@ public abstract class EventBase implements EntitlementEvent {
     // - If all that is not enough return consistent by random ordering based on UUID
     //
     @Override
-    public int compareTo(EntitlementEvent other) {
+    public int compareTo(final EntitlementEvent other) {
         if (other == null) {
             throw new NullPointerException("IEvent is compared to a null instance");
         }
@@ -161,11 +161,11 @@ public abstract class EventBase implements EntitlementEvent {
 
 
     @Override
-    public boolean equals(Object other) {
-      if (! (other instanceof EntitlementEvent)) {
-          return false;
-      }
-      return (this.compareTo((EntitlementEvent) other) == 0);
+    public boolean equals(final Object other) {
+        if (!(other instanceof EntitlementEvent)) {
+            return false;
+        }
+        return (this.compareTo((EntitlementEvent) other) == 0);
     }
 
     @Override

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/events/EventBaseBuilder.java b/entitlement/src/main/java/com/ning/billing/entitlement/events/EventBaseBuilder.java
index aa07385..7d9bb13 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/events/EventBaseBuilder.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/events/EventBaseBuilder.java
@@ -16,10 +16,10 @@
 
 package com.ning.billing.entitlement.events;
 
-import org.joda.time.DateTime;
-
 import java.util.UUID;
 
+import org.joda.time.DateTime;
+
 @SuppressWarnings("unchecked")
 public class EventBaseBuilder<T extends EventBaseBuilder<T>> {
 
@@ -39,7 +39,7 @@ public class EventBaseBuilder<T extends EventBaseBuilder<T>> {
         this.isActive = true;
     }
 
-    public EventBaseBuilder(EventBaseBuilder<?> copy) {
+    public EventBaseBuilder(final EventBaseBuilder<?> copy) {
         this.uuid = copy.uuid;
         this.subscriptionId = copy.subscriptionId;
         this.requestedDate = copy.requestedDate;
@@ -51,42 +51,42 @@ public class EventBaseBuilder<T extends EventBaseBuilder<T>> {
         this.totalOrdering = copy.totalOrdering;
     }
 
-    public T setTotalOrdering(long totalOrdering) {
+    public T setTotalOrdering(final long totalOrdering) {
         this.totalOrdering = totalOrdering;
         return (T) this;
     }
 
-    public T setUuid(UUID uuid) {
+    public T setUuid(final UUID uuid) {
         this.uuid = uuid;
         return (T) this;
     }
 
-    public T setSubscriptionId(UUID subscriptionId) {
+    public T setSubscriptionId(final UUID subscriptionId) {
         this.subscriptionId = subscriptionId;
         return (T) this;
     }
 
-    public T setRequestedDate(DateTime requestedDate) {
+    public T setRequestedDate(final DateTime requestedDate) {
         this.requestedDate = requestedDate;
         return (T) this;
     }
 
-    public T setEffectiveDate(DateTime effectiveDate) {
+    public T setEffectiveDate(final DateTime effectiveDate) {
         this.effectiveDate = effectiveDate;
         return (T) this;
     }
 
-    public T setProcessedDate(DateTime processedDate) {
+    public T setProcessedDate(final DateTime processedDate) {
         this.processedDate = processedDate;
         return (T) this;
     }
 
-    public T setActiveVersion(long activeVersion) {
+    public T setActiveVersion(final long activeVersion) {
         this.activeVersion = activeVersion;
         return (T) this;
     }
 
-    public T setActive(boolean isActive) {
+    public T setActive(final boolean isActive) {
         this.isActive = isActive;
         return (T) this;
     }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/events/phase/PhaseEventBuilder.java b/entitlement/src/main/java/com/ning/billing/entitlement/events/phase/PhaseEventBuilder.java
index 5847970..95b6fcf 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/events/phase/PhaseEventBuilder.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/events/phase/PhaseEventBuilder.java
@@ -26,11 +26,11 @@ public class PhaseEventBuilder extends EventBaseBuilder<PhaseEventBuilder> {
         super();
     }
 
-    public PhaseEventBuilder(EventBaseBuilder<?> base) {
+    public PhaseEventBuilder(final EventBaseBuilder<?> base) {
         super(base);
     }
 
-    public PhaseEventBuilder setPhaseName(String phaseName) {
+    public PhaseEventBuilder setPhaseName(final String phaseName) {
         this.phaseName = phaseName;
         return this;
     }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/events/phase/PhaseEventData.java b/entitlement/src/main/java/com/ning/billing/entitlement/events/phase/PhaseEventData.java
index 23f7b2b..f26e0f8 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/events/phase/PhaseEventData.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/events/phase/PhaseEventData.java
@@ -17,16 +17,17 @@
 package com.ning.billing.entitlement.events.phase;
 
 
+import org.joda.time.DateTime;
+
 import com.ning.billing.entitlement.api.user.SubscriptionData;
 import com.ning.billing.entitlement.events.EventBase;
-import org.joda.time.DateTime;
 
 
 public class PhaseEventData extends EventBase implements PhaseEvent {
 
     private final String phaseName;
 
-    public PhaseEventData(PhaseEventBuilder builder) {
+    public PhaseEventData(final PhaseEventBuilder builder) {
         super(builder);
         this.phaseName = builder.getPhaseName();
     }
@@ -44,8 +45,8 @@ public class PhaseEventData extends EventBase implements PhaseEvent {
     @Override
     public String toString() {
         return "PhaseEvent [getId()= " + getId()
-        		+ ", phaseName=" + phaseName
-        		+ ", getType()=" + getType()
+                + ", phaseName=" + phaseName
+                + ", getType()=" + getType()
                 + ", getPhase()=" + getPhase()
                 + ", getRequestedDate()=" + getRequestedDate()
                 + ", getEffectiveDate()=" + getEffectiveDate()
@@ -55,15 +56,15 @@ public class PhaseEventData extends EventBase implements PhaseEvent {
                 + ", isActive()=" + isActive() + "]\n";
     }
 
-    public static final PhaseEvent createNextPhaseEvent(String phaseName, SubscriptionData subscription, DateTime now, DateTime effectiveDate) {
+    public static PhaseEvent createNextPhaseEvent(final String phaseName, final SubscriptionData subscription, final DateTime now, final DateTime effectiveDate) {
         return (phaseName == null) ?
                 null :
-                    new PhaseEventData(new PhaseEventBuilder()
-                        .setSubscriptionId(subscription.getId())
-                        .setRequestedDate(now)
-                        .setEffectiveDate(effectiveDate)
-                        .setProcessedDate(now)
-                        .setActiveVersion(subscription.getActiveVersion())
-                        .setPhaseName(phaseName));
+                new PhaseEventData(new PhaseEventBuilder()
+                                           .setSubscriptionId(subscription.getId())
+                                           .setRequestedDate(now)
+                                           .setEffectiveDate(effectiveDate)
+                                           .setProcessedDate(now)
+                                           .setActiveVersion(subscription.getActiveVersion())
+                                           .setPhaseName(phaseName));
     }
 }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEvent.java b/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEvent.java
index 20a6569..9a91b76 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEvent.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEvent.java
@@ -32,7 +32,7 @@ public interface ApiEvent extends EntitlementEvent {
     public String getPriceList();
 
     public boolean isFromDisk();
-    
+
     public UUID getUserToken();
 
 }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventBase.java b/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventBase.java
index d2ea706..83c2812 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventBase.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventBase.java
@@ -16,10 +16,10 @@
 
 package com.ning.billing.entitlement.events.user;
 
-import com.ning.billing.entitlement.events.EventBase;
-
 import java.util.UUID;
 
+import com.ning.billing.entitlement.events.EventBase;
+
 public class ApiEventBase extends EventBase implements ApiEvent {
 
     private final ApiEventType eventType;
@@ -30,7 +30,7 @@ public class ApiEventBase extends EventBase implements ApiEvent {
     private final UUID userToken;
     private final boolean fromDisk;
 
-    public ApiEventBase(ApiEventBuilder builder) {
+    public ApiEventBase(final ApiEventBuilder builder) {
         super(builder);
         this.eventType = builder.getEventType();
         this.eventPriceList = builder.getEventPriceList();
@@ -64,11 +64,11 @@ public class ApiEventBase extends EventBase implements ApiEvent {
     public String getPriceList() {
         return eventPriceList;
     }
-    
-	@Override
-	public UUID getUserToken() {
-		return userToken;
-	}
+
+    @Override
+    public UUID getUserToken() {
+        return userToken;
+    }
 
 
     @Override
@@ -80,8 +80,8 @@ public class ApiEventBase extends EventBase implements ApiEvent {
     @Override
     public String toString() {
         return "ApiEventBase [ getId()= " + getId()
-        		+ " eventType=" + eventType
-        		+ ", eventPlan=" + eventPlan
+                + " eventType=" + eventType
+                + ", eventPlan=" + eventPlan
                 + ", eventPlanPhase=" + eventPlanPhase
                 + ", getEventType()=" + getEventType()
                 + ", getEventPlan()=" + getEventPlan()

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventBuilder.java b/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventBuilder.java
index b6be427..82efd59 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventBuilder.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventBuilder.java
@@ -34,7 +34,7 @@ public class ApiEventBuilder extends EventBaseBuilder<ApiEventBuilder> {
         super();
     }
 
-    public ApiEventBuilder(EventBaseBuilder<?> base) {
+    public ApiEventBuilder(final EventBaseBuilder<?> base) {
         super(base);
     }
 
@@ -53,42 +53,42 @@ public class ApiEventBuilder extends EventBaseBuilder<ApiEventBuilder> {
     public String getEventPriceList() {
         return eventPriceList;
     }
-    
+
     public UUID getUserToken() {
-    	return userToken;
+        return userToken;
     }
 
     public boolean isFromDisk() {
         return fromDisk;
     }
 
-    public ApiEventBuilder setUserToken(UUID userToken) {
+    public ApiEventBuilder setUserToken(final UUID userToken) {
         this.userToken = userToken;
         return this;
     }
 
-    
-    public ApiEventBuilder setFromDisk(boolean fromDisk) {
+
+    public ApiEventBuilder setFromDisk(final boolean fromDisk) {
         this.fromDisk = fromDisk;
         return this;
     }
 
-    public ApiEventBuilder setEventType(ApiEventType eventType) {
+    public ApiEventBuilder setEventType(final ApiEventType eventType) {
         this.eventType = eventType;
         return this;
     }
 
-    public ApiEventBuilder setEventPlan(String eventPlan) {
+    public ApiEventBuilder setEventPlan(final String eventPlan) {
         this.eventPlan = eventPlan;
         return this;
     }
 
-    public ApiEventBuilder setEventPlanPhase(String eventPlanPhase) {
+    public ApiEventBuilder setEventPlanPhase(final String eventPlanPhase) {
         this.eventPlanPhase = eventPlanPhase;
         return this;
     }
 
-    public ApiEventBuilder setEventPriceList(String eventPriceList) {
+    public ApiEventBuilder setEventPriceList(final String eventPriceList) {
         this.eventPriceList = eventPriceList;
         return this;
     }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventCancel.java b/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventCancel.java
index 5df11ba..447adb4 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventCancel.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventCancel.java
@@ -19,7 +19,7 @@ package com.ning.billing.entitlement.events.user;
 public class ApiEventCancel extends ApiEventBase {
 
 
-    public ApiEventCancel(ApiEventBuilder builder) {
+    public ApiEventCancel(final ApiEventBuilder builder) {
         super(builder.setEventType(ApiEventType.CANCEL));
     }
 }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventChange.java b/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventChange.java
index 3770a2f..8b796c5 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventChange.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventChange.java
@@ -17,10 +17,9 @@
 package com.ning.billing.entitlement.events.user;
 
 
-
 public class ApiEventChange extends ApiEventBase {
 
-    public ApiEventChange(ApiEventBuilder builder) {
+    public ApiEventChange(final ApiEventBuilder builder) {
         super(builder.setEventType(ApiEventType.CHANGE));
     }
 }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventCreate.java b/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventCreate.java
index df1879d..7e9fe68 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventCreate.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventCreate.java
@@ -17,10 +17,9 @@
 package com.ning.billing.entitlement.events.user;
 
 
-
 public class ApiEventCreate extends ApiEventBase {
 
-    public ApiEventCreate(ApiEventBuilder builder) {
+    public ApiEventCreate(final ApiEventBuilder builder) {
         super(builder.setEventType(ApiEventType.CREATE));
     }
 }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventMigrateBilling.java b/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventMigrateBilling.java
index 3c10699..e206a6a 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventMigrateBilling.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventMigrateBilling.java
@@ -19,22 +19,22 @@ package com.ning.billing.entitlement.events.user;
 import org.joda.time.DateTime;
 
 public class ApiEventMigrateBilling extends ApiEventBase {
-    public ApiEventMigrateBilling(ApiEventBuilder builder) {
+    public ApiEventMigrateBilling(final ApiEventBuilder builder) {
         super(builder.setEventType(ApiEventType.MIGRATE_BILLING));
     }
 
-    public ApiEventMigrateBilling(ApiEventMigrateEntitlement input, DateTime ctd) {
+    public ApiEventMigrateBilling(final ApiEventMigrateEntitlement input, final DateTime ctd) {
         super(new ApiEventBuilder()
-        .setSubscriptionId(input.getSubscriptionId())
-        .setEventPlan(input.getEventPlan())
-        .setEventPlanPhase(input.getEventPlanPhase())
-        .setEventPriceList(input.getPriceList())
-        .setActiveVersion(input.getActiveVersion())
-        .setEffectiveDate(ctd)
-        .setProcessedDate(input.getProcessedDate())
-        .setRequestedDate(input.getRequestedDate())
-        .setFromDisk(true)
-        .setEventType(ApiEventType.MIGRATE_BILLING));
+                      .setSubscriptionId(input.getSubscriptionId())
+                      .setEventPlan(input.getEventPlan())
+                      .setEventPlanPhase(input.getEventPlanPhase())
+                      .setEventPriceList(input.getPriceList())
+                      .setActiveVersion(input.getActiveVersion())
+                      .setEffectiveDate(ctd)
+                      .setProcessedDate(input.getProcessedDate())
+                      .setRequestedDate(input.getRequestedDate())
+                      .setFromDisk(true)
+                      .setEventType(ApiEventType.MIGRATE_BILLING));
     }
 
 }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventMigrateEntitlement.java b/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventMigrateEntitlement.java
index 7c704cd..4ebc9a6 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventMigrateEntitlement.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventMigrateEntitlement.java
@@ -18,7 +18,7 @@ package com.ning.billing.entitlement.events.user;
 
 public class ApiEventMigrateEntitlement extends ApiEventBase {
 
-    public ApiEventMigrateEntitlement(ApiEventBuilder builder) {
+    public ApiEventMigrateEntitlement(final ApiEventBuilder builder) {
         super(builder.setEventType(ApiEventType.MIGRATE_ENTITLEMENT));
     }
 }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventReCreate.java b/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventReCreate.java
index f608210..6e024b4 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventReCreate.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventReCreate.java
@@ -18,7 +18,7 @@ package com.ning.billing.entitlement.events.user;
 
 public class ApiEventReCreate extends ApiEventBase {
 
-    public ApiEventReCreate(ApiEventBuilder builder) {
+    public ApiEventReCreate(final ApiEventBuilder builder) {
         super(builder.setEventType(ApiEventType.RE_CREATE));
     }
 }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventType.java b/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventType.java
index d1eae92..fb1954c 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventType.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventType.java
@@ -22,31 +22,45 @@ import com.ning.billing.entitlement.api.SubscriptionTransitionType;
 public enum ApiEventType {
     MIGRATE_ENTITLEMENT {
         @Override
-        public SubscriptionTransitionType getSubscriptionTransitionType() { return SubscriptionTransitionType.MIGRATE_ENTITLEMENT; }
+        public SubscriptionTransitionType getSubscriptionTransitionType() {
+            return SubscriptionTransitionType.MIGRATE_ENTITLEMENT;
+        }
     },
     CREATE {
         @Override
-        public SubscriptionTransitionType getSubscriptionTransitionType() { return SubscriptionTransitionType.CREATE; }
+        public SubscriptionTransitionType getSubscriptionTransitionType() {
+            return SubscriptionTransitionType.CREATE;
+        }
     },
     MIGRATE_BILLING {
         @Override
-        public SubscriptionTransitionType getSubscriptionTransitionType() { return SubscriptionTransitionType.MIGRATE_BILLING; }
+        public SubscriptionTransitionType getSubscriptionTransitionType() {
+            return SubscriptionTransitionType.MIGRATE_BILLING;
+        }
     },
     CHANGE {
         @Override
-        public SubscriptionTransitionType getSubscriptionTransitionType() { return SubscriptionTransitionType.CHANGE; }
+        public SubscriptionTransitionType getSubscriptionTransitionType() {
+            return SubscriptionTransitionType.CHANGE;
+        }
     },
     RE_CREATE {
         @Override
-        public SubscriptionTransitionType getSubscriptionTransitionType() { return SubscriptionTransitionType.RE_CREATE; }
+        public SubscriptionTransitionType getSubscriptionTransitionType() {
+            return SubscriptionTransitionType.RE_CREATE;
+        }
     },
     CANCEL {
         @Override
-        public SubscriptionTransitionType getSubscriptionTransitionType() { return SubscriptionTransitionType.CANCEL; }
+        public SubscriptionTransitionType getSubscriptionTransitionType() {
+            return SubscriptionTransitionType.CANCEL;
+        }
     },
     UNCANCEL {
         @Override
-        public SubscriptionTransitionType getSubscriptionTransitionType() { return SubscriptionTransitionType.UNCANCEL; }
+        public SubscriptionTransitionType getSubscriptionTransitionType() {
+            return SubscriptionTransitionType.UNCANCEL;
+        }
     };
 
     // Used to map from internal events to User visible events (both user and phase)

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventUncancel.java b/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventUncancel.java
index 93d8029..039c762 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventUncancel.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/events/user/ApiEventUncancel.java
@@ -18,7 +18,7 @@ package com.ning.billing.entitlement.events.user;
 
 public class ApiEventUncancel extends ApiEventBase {
 
-    public ApiEventUncancel(ApiEventBuilder builder) {
+    public ApiEventUncancel(final ApiEventBuilder builder) {
         super(builder.setEventType(ApiEventType.UNCANCEL));
     }
 }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/exceptions/EntitlementError.java b/entitlement/src/main/java/com/ning/billing/entitlement/exceptions/EntitlementError.java
index 2cdba51..79daec9 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/exceptions/EntitlementError.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/exceptions/EntitlementError.java
@@ -24,15 +24,15 @@ public class EntitlementError extends Error {
         super();
     }
 
-    public EntitlementError(String msg, Throwable arg1) {
+    public EntitlementError(final String msg, final Throwable arg1) {
         super(msg, arg1);
     }
 
-    public EntitlementError(String msg) {
+    public EntitlementError(final String msg) {
         super(msg);
     }
 
-    public EntitlementError(Throwable msg) {
+    public EntitlementError(final Throwable msg) {
         super(msg);
     }
 }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/glue/DefaultEntitlementModule.java b/entitlement/src/main/java/com/ning/billing/entitlement/glue/DefaultEntitlementModule.java
index a809c9f..5dc11bf 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/glue/DefaultEntitlementModule.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/glue/DefaultEntitlementModule.java
@@ -41,16 +41,16 @@ import com.ning.billing.entitlement.api.user.DefaultSubscriptionFactory;
 import com.ning.billing.entitlement.api.user.EntitlementUserApi;
 import com.ning.billing.entitlement.engine.addon.AddonUtils;
 import com.ning.billing.entitlement.engine.core.Engine;
-import com.ning.billing.entitlement.engine.dao.EntitlementDao;
 import com.ning.billing.entitlement.engine.dao.AuditedEntitlementDao;
+import com.ning.billing.entitlement.engine.dao.EntitlementDao;
 import com.ning.billing.entitlement.engine.dao.RepairEntitlementDao;
 import com.ning.billing.glue.EntitlementModule;
 import com.ning.billing.util.glue.RealImplementation;
 
-public class DefaultEntitlementModule extends AbstractModule implements EntitlementModule{
-    
+public class DefaultEntitlementModule extends AbstractModule implements EntitlementModule {
+
     public static final String REPAIR_NAMED = "repair";
-    
+
     protected void installConfig() {
         final EntitlementConfig config = new ConfigurationObjectFactory(System.getProperties()).build(EntitlementConfig.class);
         bind(EntitlementConfig.class).toInstance(config);
@@ -62,20 +62,20 @@ public class DefaultEntitlementModule extends AbstractModule implements Entitlem
         bind(RepairEntitlementLifecycleDao.class).annotatedWith(Names.named(REPAIR_NAMED)).to(RepairEntitlementDao.class);
         bind(RepairEntitlementDao.class).asEagerSingleton();
     }
-    
+
     protected void installEntitlementCore() {
-        
+
         bind(SubscriptionFactory.class).annotatedWith(Names.named(REPAIR_NAMED)).to(RepairSubscriptionFactory.class).asEagerSingleton();
         bind(SubscriptionFactory.class).to(DefaultSubscriptionFactory.class).asEagerSingleton();
-        
+
         bind(SubscriptionApiService.class).annotatedWith(Names.named(REPAIR_NAMED)).to(RepairSubscriptionApiService.class).asEagerSingleton();
         bind(SubscriptionApiService.class).to(DefaultSubscriptionApiService.class).asEagerSingleton();
-        
+
         bind(Engine.class).asEagerSingleton();
         bind(PlanAligner.class).asEagerSingleton();
         bind(AddonUtils.class).asEagerSingleton();
         bind(MigrationPlanAligner.class).asEagerSingleton();
-        
+
         installEntitlementService();
         installEntitlementTimelineApi();
         installEntitlementMigrationApi();
@@ -93,7 +93,7 @@ public class DefaultEntitlementModule extends AbstractModule implements Entitlem
     @Override
     public void installEntitlementService() {
         bind(EntitlementService.class).to(Engine.class).asEagerSingleton();
-     }
+    }
 
     @Override
     public void installEntitlementTimelineApi() {

diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/api/migration/TestMigration.java b/entitlement/src/test/java/com/ning/billing/entitlement/api/migration/TestMigration.java
index 2681a0b..961923f 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/api/migration/TestMigration.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/api/migration/TestMigration.java
@@ -16,11 +16,6 @@
 
 package com.ning.billing.entitlement.api.migration;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
@@ -45,29 +40,34 @@ import com.ning.billing.entitlement.api.user.Subscription;
 import com.ning.billing.entitlement.api.user.Subscription.SubscriptionState;
 import com.ning.billing.entitlement.api.user.SubscriptionBundle;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+
 public abstract class TestMigration extends TestApiBase {
     public void testSingleBasePlan() {
 
         try {
-            
+
             log.info("Starting testSingleBasePlan");
 
             final DateTime startDate = clock.getUTCNow().minusMonths(2);
-            DateTime beforeMigration =  clock.getUTCNow();
-            EntitlementAccountMigration toBeMigrated = createAccountWithRegularBasePlan(startDate);
-            DateTime afterMigration = clock.getUTCNow();
+            final DateTime beforeMigration = clock.getUTCNow();
+            final EntitlementAccountMigration toBeMigrated = createAccountWithRegularBasePlan(startDate);
+            final DateTime afterMigration = clock.getUTCNow();
 
             testListener.pushExpectedEvent(NextEvent.MIGRATE_ENTITLEMENT);
             migrationApi.migrate(toBeMigrated, context);
             assertTrue(testListener.isCompleted(5000));
 
-            List<SubscriptionBundle> bundles = entitlementApi.getBundlesForAccount(toBeMigrated.getAccountKey());
+            final List<SubscriptionBundle> bundles = entitlementApi.getBundlesForAccount(toBeMigrated.getAccountKey());
             assertEquals(bundles.size(), 1);
-            SubscriptionBundle bundle = bundles.get(0);
+            final SubscriptionBundle bundle = bundles.get(0);
 
-            List<Subscription> subscriptions = entitlementApi.getSubscriptionsForBundle(bundle.getId());
+            final List<Subscription> subscriptions = entitlementApi.getSubscriptionsForBundle(bundle.getId());
             assertEquals(subscriptions.size(), 1);
-            Subscription subscription = subscriptions.get(0);
+            final Subscription subscription = subscriptions.get(0);
             assertDateWithin(subscription.getStartDate(), beforeMigration, afterMigration);
             assertEquals(subscription.getEndDate(), null);
             assertEquals(subscription.getCurrentPriceList().getName(), PriceListSet.DEFAULT_PRICELIST_NAME);
@@ -85,25 +85,25 @@ public abstract class TestMigration extends TestApiBase {
     public void testPlanWithAddOn() {
         try {
             log.info("Starting testPlanWithAddOn");
-            DateTime beforeMigration = clock.getUTCNow();
+            final DateTime beforeMigration = clock.getUTCNow();
             final DateTime initalBPStart = clock.getUTCNow().minusMonths(3);
             final DateTime initalAddonStart = clock.getUTCNow().minusMonths(1).plusDays(7);
-            EntitlementAccountMigration toBeMigrated = createAccountWithRegularBasePlanAndAddons(initalBPStart, initalAddonStart);
-            DateTime afterMigration = clock.getUTCNow();
+            final EntitlementAccountMigration toBeMigrated = createAccountWithRegularBasePlanAndAddons(initalBPStart, initalAddonStart);
+            final DateTime afterMigration = clock.getUTCNow();
 
             testListener.pushExpectedEvent(NextEvent.MIGRATE_ENTITLEMENT);
             testListener.pushExpectedEvent(NextEvent.MIGRATE_ENTITLEMENT);
             migrationApi.migrate(toBeMigrated, context);
             assertTrue(testListener.isCompleted(5000));
 
-            List<SubscriptionBundle> bundles = entitlementApi.getBundlesForAccount(toBeMigrated.getAccountKey());
+            final List<SubscriptionBundle> bundles = entitlementApi.getBundlesForAccount(toBeMigrated.getAccountKey());
             assertEquals(bundles.size(), 1);
-            SubscriptionBundle bundle = bundles.get(0);
+            final SubscriptionBundle bundle = bundles.get(0);
 
-            List<Subscription> subscriptions = entitlementApi.getSubscriptionsForBundle(bundle.getId());
+            final List<Subscription> subscriptions = entitlementApi.getSubscriptionsForBundle(bundle.getId());
             assertEquals(subscriptions.size(), 2);
 
-            Subscription baseSubscription = (subscriptions.get(0).getCurrentPlan().getProduct().getCategory() == ProductCategory.BASE) ?
+            final Subscription baseSubscription = (subscriptions.get(0).getCurrentPlan().getProduct().getCategory() == ProductCategory.BASE) ?
                     subscriptions.get(0) : subscriptions.get(1);
             assertDateWithin(baseSubscription.getStartDate(), beforeMigration, afterMigration);
             assertEquals(baseSubscription.getEndDate(), null);
@@ -113,7 +113,7 @@ public abstract class TestMigration extends TestApiBase {
             assertEquals(baseSubscription.getCurrentPlan().getName(), "shotgun-annual");
             assertEquals(baseSubscription.getChargedThroughDate(), initalBPStart.plusYears(1));
 
-            Subscription aoSubscription = (subscriptions.get(0).getCurrentPlan().getProduct().getCategory() == ProductCategory.ADD_ON) ?
+            final Subscription aoSubscription = (subscriptions.get(0).getCurrentPlan().getProduct().getCategory() == ProductCategory.ADD_ON) ?
                     subscriptions.get(0) : subscriptions.get(1);
             // initalAddonStart.plusMonths(1).minusMonths(1) may be different from initalAddonStart, depending on exact date
             // e.g : March 31 + 1 month => April 30 and April 30 - 1 month = March 30 which is != March 31 !!!! 
@@ -136,22 +136,22 @@ public abstract class TestMigration extends TestApiBase {
         try {
             log.info("Starting testSingleBasePlanFutureCancelled");
             final DateTime startDate = clock.getUTCNow().minusMonths(1);
-            DateTime beforeMigration = clock.getUTCNow();
-            EntitlementAccountMigration toBeMigrated = createAccountWithRegularBasePlanFutreCancelled(startDate);
-            DateTime afterMigration = clock.getUTCNow();
+            final DateTime beforeMigration = clock.getUTCNow();
+            final EntitlementAccountMigration toBeMigrated = createAccountWithRegularBasePlanFutreCancelled(startDate);
+            final DateTime afterMigration = clock.getUTCNow();
 
             testListener.pushExpectedEvent(NextEvent.MIGRATE_ENTITLEMENT);
             migrationApi.migrate(toBeMigrated, context);
             assertTrue(testListener.isCompleted(5000));
 
-            List<SubscriptionBundle> bundles = entitlementApi.getBundlesForAccount(toBeMigrated.getAccountKey());
+            final List<SubscriptionBundle> bundles = entitlementApi.getBundlesForAccount(toBeMigrated.getAccountKey());
             assertEquals(bundles.size(), 1);
-            SubscriptionBundle bundle = bundles.get(0);
+            final SubscriptionBundle bundle = bundles.get(0);
             //assertEquals(bundle.getStartDate(), effectiveDate);
 
-            List<Subscription> subscriptions = entitlementApi.getSubscriptionsForBundle(bundle.getId());
+            final List<Subscription> subscriptions = entitlementApi.getSubscriptionsForBundle(bundle.getId());
             assertEquals(subscriptions.size(), 1);
-            Subscription subscription = subscriptions.get(0);
+            final Subscription subscription = subscriptions.get(0);
             assertDateWithin(subscription.getStartDate(), beforeMigration, afterMigration);
             assertEquals(subscription.getCurrentPriceList().getName(), PriceListSet.DEFAULT_PRICELIST_NAME);
             assertEquals(subscription.getCurrentPhase().getPhaseType(), PhaseType.EVERGREEN);
@@ -162,8 +162,8 @@ public abstract class TestMigration extends TestApiBase {
 
             testListener.pushExpectedEvent(NextEvent.MIGRATE_BILLING);
             testListener.pushExpectedEvent(NextEvent.CANCEL);
-            
-            Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusYears(1));
+
+            final Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusYears(1));
             clock.addDeltaFromReality(it.toDurationMillis());
             assertTrue(testListener.isCompleted(5000));
 
@@ -176,7 +176,7 @@ public abstract class TestMigration extends TestApiBase {
             assertNull(subscription.getCurrentPlan());
 
             assertListenerStatus();
-            
+
         } catch (EntitlementMigrationApiException e) {
             Assert.fail("", e);
         }
@@ -185,22 +185,22 @@ public abstract class TestMigration extends TestApiBase {
     public void testSingleBasePlanWithPendingPhase() {
 
         try {
-            
+
             log.info("Starting testSingleBasePlanWithPendingPhase");
             final DateTime trialDate = clock.getUTCNow().minusDays(10);
-            EntitlementAccountMigration toBeMigrated = createAccountFuturePendingPhase(trialDate);
+            final EntitlementAccountMigration toBeMigrated = createAccountFuturePendingPhase(trialDate);
 
             testListener.pushExpectedEvent(NextEvent.MIGRATE_ENTITLEMENT);
             migrationApi.migrate(toBeMigrated, context);
             assertTrue(testListener.isCompleted(5000));
 
-            List<SubscriptionBundle> bundles = entitlementApi.getBundlesForAccount(toBeMigrated.getAccountKey());
+            final List<SubscriptionBundle> bundles = entitlementApi.getBundlesForAccount(toBeMigrated.getAccountKey());
             assertEquals(bundles.size(), 1);
-            SubscriptionBundle bundle = bundles.get(0);
+            final SubscriptionBundle bundle = bundles.get(0);
 
-            List<Subscription> subscriptions = entitlementApi.getSubscriptionsForBundle(bundle.getId());
+            final List<Subscription> subscriptions = entitlementApi.getSubscriptionsForBundle(bundle.getId());
             assertEquals(subscriptions.size(), 1);
-            Subscription subscription = subscriptions.get(0);
+            final Subscription subscription = subscriptions.get(0);
 
             assertEquals(subscription.getStartDate(), trialDate);
             assertEquals(subscription.getEndDate(), null);
@@ -213,7 +213,7 @@ public abstract class TestMigration extends TestApiBase {
             testListener.pushExpectedEvent(NextEvent.MIGRATE_BILLING);
             testListener.pushExpectedEvent(NextEvent.PHASE);
 
-            Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(30));
+            final Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(30));
             clock.addDeltaFromReality(it.toDurationMillis());
             assertTrue(testListener.isCompleted(5000));
 
@@ -226,7 +226,7 @@ public abstract class TestMigration extends TestApiBase {
             assertEquals(subscription.getCurrentPhase().getName(), "assault-rifle-monthly-evergreen");
 
             assertListenerStatus();
-            
+
         } catch (EntitlementMigrationApiException e) {
             Assert.fail("", e);
         }
@@ -236,21 +236,21 @@ public abstract class TestMigration extends TestApiBase {
 
         try {
             log.info("Starting testSingleBasePlanWithPendingChange");
-            DateTime beforeMigration = clock.getUTCNow();
-            EntitlementAccountMigration toBeMigrated = createAccountFuturePendingChange();
-            DateTime afterMigration = clock.getUTCNow();
+            final DateTime beforeMigration = clock.getUTCNow();
+            final EntitlementAccountMigration toBeMigrated = createAccountFuturePendingChange();
+            final DateTime afterMigration = clock.getUTCNow();
 
             testListener.pushExpectedEvent(NextEvent.MIGRATE_ENTITLEMENT);
             migrationApi.migrate(toBeMigrated, context);
             assertTrue(testListener.isCompleted(5000));
 
-            List<SubscriptionBundle> bundles = entitlementApi.getBundlesForAccount(toBeMigrated.getAccountKey());
+            final List<SubscriptionBundle> bundles = entitlementApi.getBundlesForAccount(toBeMigrated.getAccountKey());
             assertEquals(bundles.size(), 1);
-            SubscriptionBundle bundle = bundles.get(0);
+            final SubscriptionBundle bundle = bundles.get(0);
 
-            List<Subscription> subscriptions = entitlementApi.getSubscriptionsForBundle(bundle.getId());
+            final List<Subscription> subscriptions = entitlementApi.getSubscriptionsForBundle(bundle.getId());
             assertEquals(subscriptions.size(), 1);
-            Subscription subscription = subscriptions.get(0);
+            final Subscription subscription = subscriptions.get(0);
             assertDateWithin(subscription.getStartDate(), beforeMigration, afterMigration);
             assertEquals(subscription.getEndDate(), null);
             assertEquals(subscription.getCurrentPriceList().getName(), PriceListSet.DEFAULT_PRICELIST_NAME);
@@ -259,8 +259,8 @@ public abstract class TestMigration extends TestApiBase {
             assertEquals(subscription.getCurrentPlan().getName(), "assault-rifle-monthly");
 
             testListener.pushExpectedEvent(NextEvent.CHANGE);
-            
-            Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusMonths(1));
+
+            final Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusMonths(1));
             clock.addDeltaFromReality(it.toDurationMillis());
             assertTrue(testListener.isCompleted(5000));
 
@@ -273,7 +273,7 @@ public abstract class TestMigration extends TestApiBase {
             assertEquals(subscription.getCurrentPlan().getName(), "shotgun-annual");
 
             assertListenerStatus();
-            
+
         } catch (EntitlementMigrationApiException e) {
             Assert.fail("", e);
         }
@@ -288,29 +288,31 @@ public abstract class TestMigration extends TestApiBase {
 
             @Override
             public EntitlementBundleMigration[] getBundles() {
-                List<EntitlementBundleMigration> bundles = new ArrayList<EntitlementBundleMigration>();
-                EntitlementBundleMigration bundle0 = new EntitlementBundleMigration() {
+                final List<EntitlementBundleMigration> bundles = new ArrayList<EntitlementBundleMigration>();
+                final EntitlementBundleMigration bundle0 = new EntitlementBundleMigration() {
 
                     @Override
                     public EntitlementSubscriptionMigration[] getSubscriptions() {
 
-                        EntitlementSubscriptionMigration[] result = new EntitlementSubscriptionMigration[cases.size()];
+                        final EntitlementSubscriptionMigration[] result = new EntitlementSubscriptionMigration[cases.size()];
 
                         for (int i = 0; i < cases.size(); i++) {
 
                             final List<EntitlementSubscriptionMigrationCaseWithCTD> curCases = cases.get(i);
-                            EntitlementSubscriptionMigration subscription = new EntitlementSubscriptionMigration() {
+                            final EntitlementSubscriptionMigration subscription = new EntitlementSubscriptionMigration() {
                                 @Override
                                 public EntitlementSubscriptionMigrationCaseWithCTD[] getSubscriptionCases() {
                                     return curCases.toArray(new EntitlementSubscriptionMigrationCaseWithCTD[curCases.size()]);
                                 }
+
                                 @Override
                                 public ProductCategory getCategory() {
                                     return curCases.get(0).getPlanPhaseSpecifier().getProductCategory();
                                 }
+
                                 @Override
                                 public DateTime getChargedThroughDate() {
-                                    for (EntitlementSubscriptionMigrationCaseWithCTD cur :curCases) {
+                                    for (final EntitlementSubscriptionMigrationCaseWithCTD cur : curCases) {
                                         if (cur.getChargedThroughDate() != null) {
                                             return cur.getChargedThroughDate();
                                         }
@@ -322,6 +324,7 @@ public abstract class TestMigration extends TestApiBase {
                         }
                         return result;
                     }
+
                     @Override
                     public String getBundleKey() {
                         return "12345";
@@ -340,14 +343,14 @@ public abstract class TestMigration extends TestApiBase {
 
     private EntitlementAccountMigration createAccountWithRegularBasePlanAndAddons(final DateTime initialBPstart, final DateTime initalAddonStart) {
 
-        List<EntitlementSubscriptionMigrationCaseWithCTD> cases = new LinkedList<EntitlementSubscriptionMigrationCaseWithCTD>();
+        final List<EntitlementSubscriptionMigrationCaseWithCTD> cases = new LinkedList<EntitlementSubscriptionMigrationCaseWithCTD>();
         cases.add(new EntitlementSubscriptionMigrationCaseWithCTD(
                 new PlanPhaseSpecifier("Shotgun", ProductCategory.BASE, BillingPeriod.ANNUAL, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.EVERGREEN),
                 initialBPstart,
                 null,
                 initialBPstart.plusYears(1)));
 
-        List<EntitlementSubscriptionMigrationCaseWithCTD> firstAddOnCases = new LinkedList<EntitlementSubscriptionMigrationCaseWithCTD>();
+        final List<EntitlementSubscriptionMigrationCaseWithCTD> firstAddOnCases = new LinkedList<EntitlementSubscriptionMigrationCaseWithCTD>();
         firstAddOnCases.add(new EntitlementSubscriptionMigrationCaseWithCTD(
                 new PlanPhaseSpecifier("Telescopic-Scope", ProductCategory.ADD_ON, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.DISCOUNT),
                 initalAddonStart,
@@ -360,39 +363,39 @@ public abstract class TestMigration extends TestApiBase {
                 null));
 
 
-        List<List<EntitlementSubscriptionMigrationCaseWithCTD>> input = new ArrayList<List<EntitlementSubscriptionMigrationCaseWithCTD>>();
+        final List<List<EntitlementSubscriptionMigrationCaseWithCTD>> input = new ArrayList<List<EntitlementSubscriptionMigrationCaseWithCTD>>();
         input.add(cases);
         input.add(firstAddOnCases);
         return createAccountTest(input);
     }
 
     private EntitlementAccountMigration createAccountWithRegularBasePlan(final DateTime startDate) {
-        List<EntitlementSubscriptionMigrationCaseWithCTD> cases = new LinkedList<EntitlementSubscriptionMigrationCaseWithCTD>();
+        final List<EntitlementSubscriptionMigrationCaseWithCTD> cases = new LinkedList<EntitlementSubscriptionMigrationCaseWithCTD>();
         cases.add(new EntitlementSubscriptionMigrationCaseWithCTD(
                 new PlanPhaseSpecifier("Assault-Rifle", ProductCategory.BASE, BillingPeriod.ANNUAL, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.EVERGREEN),
                 startDate,
                 null,
                 startDate.plusYears(1)));
-        List<List<EntitlementSubscriptionMigrationCaseWithCTD>> input = new ArrayList<List<EntitlementSubscriptionMigrationCaseWithCTD>>();
+        final List<List<EntitlementSubscriptionMigrationCaseWithCTD>> input = new ArrayList<List<EntitlementSubscriptionMigrationCaseWithCTD>>();
         input.add(cases);
         return createAccountTest(input);
     }
 
     private EntitlementAccountMigration createAccountWithRegularBasePlanFutreCancelled(final DateTime startDate) {
-        List<EntitlementSubscriptionMigrationCaseWithCTD> cases = new LinkedList<EntitlementSubscriptionMigrationCaseWithCTD>();
+        final List<EntitlementSubscriptionMigrationCaseWithCTD> cases = new LinkedList<EntitlementSubscriptionMigrationCaseWithCTD>();
         cases.add(new EntitlementSubscriptionMigrationCaseWithCTD(
                 new PlanPhaseSpecifier("Assault-Rifle", ProductCategory.BASE, BillingPeriod.ANNUAL, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.EVERGREEN),
                 startDate,
                 startDate.plusYears(1),
                 startDate.plusYears(1)));
-        List<List<EntitlementSubscriptionMigrationCaseWithCTD>> input = new ArrayList<List<EntitlementSubscriptionMigrationCaseWithCTD>>();
+        final List<List<EntitlementSubscriptionMigrationCaseWithCTD>> input = new ArrayList<List<EntitlementSubscriptionMigrationCaseWithCTD>>();
         input.add(cases);
         return createAccountTest(input);
     }
 
 
     private EntitlementAccountMigration createAccountFuturePendingPhase(final DateTime trialDate) {
-        List<EntitlementSubscriptionMigrationCaseWithCTD> cases = new LinkedList<EntitlementSubscriptionMigrationCaseWithCTD>();
+        final List<EntitlementSubscriptionMigrationCaseWithCTD> cases = new LinkedList<EntitlementSubscriptionMigrationCaseWithCTD>();
         cases.add(new EntitlementSubscriptionMigrationCaseWithCTD(
                 new PlanPhaseSpecifier("Assault-Rifle", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.TRIAL),
                 trialDate,
@@ -403,13 +406,13 @@ public abstract class TestMigration extends TestApiBase {
                 trialDate.plusDays(30),
                 null,
                 null));
-        List<List<EntitlementSubscriptionMigrationCaseWithCTD>> input = new ArrayList<List<EntitlementSubscriptionMigrationCaseWithCTD>>();
+        final List<List<EntitlementSubscriptionMigrationCaseWithCTD>> input = new ArrayList<List<EntitlementSubscriptionMigrationCaseWithCTD>>();
         input.add(cases);
         return createAccountTest(input);
     }
 
     private EntitlementAccountMigration createAccountFuturePendingChange() {
-        List<EntitlementSubscriptionMigrationCaseWithCTD> cases = new LinkedList<EntitlementSubscriptionMigrationCaseWithCTD>();
+        final List<EntitlementSubscriptionMigrationCaseWithCTD> cases = new LinkedList<EntitlementSubscriptionMigrationCaseWithCTD>();
         final DateTime effectiveDate = clock.getUTCNow().minusDays(10);
         cases.add(new EntitlementSubscriptionMigrationCaseWithCTD(
                 new PlanPhaseSpecifier("Assault-Rifle", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.EVERGREEN),
@@ -421,7 +424,7 @@ public abstract class TestMigration extends TestApiBase {
                 effectiveDate.plusMonths(1).plusDays(1),
                 null,
                 null));
-        List<List<EntitlementSubscriptionMigrationCaseWithCTD>> input = new ArrayList<List<EntitlementSubscriptionMigrationCaseWithCTD>>();
+        final List<List<EntitlementSubscriptionMigrationCaseWithCTD>> input = new ArrayList<List<EntitlementSubscriptionMigrationCaseWithCTD>>();
         input.add(cases);
         return createAccountTest(input);
     }
@@ -434,7 +437,7 @@ public abstract class TestMigration extends TestApiBase {
         private final DateTime cancelDt;
         private final DateTime ctd;
 
-        public EntitlementSubscriptionMigrationCaseWithCTD(PlanPhaseSpecifier pps, DateTime effDt, DateTime cancelDt, DateTime ctd) {
+        public EntitlementSubscriptionMigrationCaseWithCTD(final PlanPhaseSpecifier pps, final DateTime effDt, final DateTime cancelDt, final DateTime ctd) {
             this.pps = pps;
             this.cancelDt = cancelDt;
             this.effDt = effDt;

diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/api/migration/TestMigrationMemory.java b/entitlement/src/test/java/com/ning/billing/entitlement/api/migration/TestMigrationMemory.java
index 0195d69..81c12cd 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/api/migration/TestMigrationMemory.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/api/migration/TestMigrationMemory.java
@@ -31,26 +31,26 @@ public class TestMigrationMemory extends TestMigration {
     }
 
     @Override
-    @Test(enabled=true, groups="fast")
+    @Test(enabled = true, groups = "fast")
     public void testSingleBasePlan() {
         super.testSingleBasePlan();
     }
 
     @Override
-    @Test(enabled=true, groups="fast")
+    @Test(enabled = true, groups = "fast")
     public void testSingleBasePlanFutureCancelled() {
         super.testSingleBasePlanFutureCancelled();
     }
 
     @Override
-    @Test(enabled=true, groups="fast")
+    @Test(enabled = true, groups = "fast")
     public void testPlanWithAddOn() {
         super.testPlanWithAddOn();
     }
 
 
     @Override
-    @Test(enabled=true, groups="fast")
+    @Test(enabled = true, groups = "fast")
     public void testSingleBasePlanWithPendingPhase() {
         super.testSingleBasePlanWithPendingPhase();
     }

diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/api/migration/TestMigrationSql.java b/entitlement/src/test/java/com/ning/billing/entitlement/api/migration/TestMigrationSql.java
index 34b2266..82fc7e7 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/api/migration/TestMigrationSql.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/api/migration/TestMigrationSql.java
@@ -30,25 +30,25 @@ public class TestMigrationSql extends TestMigration {
     }
 
     @Override
-    @Test(enabled=true, groups="slow")
+    @Test(enabled = true, groups = "slow")
     public void testSingleBasePlan() {
         super.testSingleBasePlan();
     }
 
     @Override
-    @Test(enabled=true, groups="slow")
+    @Test(enabled = true, groups = "slow")
     public void testPlanWithAddOn() {
         super.testPlanWithAddOn();
     }
 
     @Override
-    @Test(enabled=true, groups="slow")
+    @Test(enabled = true, groups = "slow")
     public void testSingleBasePlanFutureCancelled() {
         super.testSingleBasePlanFutureCancelled();
     }
 
     @Override
-    @Test(enabled=true, groups="slow")
+    @Test(enabled = true, groups = "slow")
     public void testSingleBasePlanWithPendingPhase() {
         super.testSingleBasePlanWithPendingPhase();
     }

diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/api/TestApiBase.java b/entitlement/src/test/java/com/ning/billing/entitlement/api/TestApiBase.java
index ba09b34..f69b484 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/api/TestApiBase.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/api/TestApiBase.java
@@ -16,18 +16,12 @@
 
 package com.ning.billing.entitlement.api;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
+import javax.annotation.Nullable;
 import java.io.IOException;
 import java.net.URL;
 import java.util.List;
 import java.util.UUID;
 
-import javax.annotation.Nullable;
-
 import org.apache.commons.io.IOUtils;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
@@ -82,9 +76,14 @@ import com.ning.billing.util.clock.Clock;
 import com.ning.billing.util.clock.ClockMock;
 import com.ning.billing.util.glue.RealImplementation;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
 
 public abstract class TestApiBase implements TestListenerStatus {
-    
+
     protected static final Logger log = LoggerFactory.getLogger(TestApiBase.class);
 
     protected static final long DAY_IN_MS = (24 * 3600 * 1000);
@@ -111,7 +110,7 @@ public abstract class TestApiBase implements TestListenerStatus {
     protected CallContext context = new TestCallContext("Api Test");
 
     private boolean isListenerFailed;
-    private String listenerFailedMsg;    
+    private String listenerFailedMsg;
 
     //
     // The date on which we make our test start; just to ensure that running tests at different dates does not
@@ -120,13 +119,12 @@ public abstract class TestApiBase implements TestListenerStatus {
     protected DateTime testStartDate = new DateTime(2012, 5, 7, 0, 3, 42, 0);
 
 
-    
     public static void loadSystemPropertiesFromClasspath(final String resource) {
         final URL url = TestApiBase.class.getResource(resource);
         assertNotNull(url);
 
         try {
-            System.getProperties().load( url.openStream() );
+            System.getProperties().load(url.openStream());
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -146,7 +144,7 @@ public abstract class TestApiBase implements TestListenerStatus {
         }
     }
 
-    
+
     @Override
     public void failed(final String msg) {
         this.isListenerFailed = true;
@@ -158,7 +156,7 @@ public abstract class TestApiBase implements TestListenerStatus {
         this.isListenerFailed = false;
         this.listenerFailedMsg = null;
     }
-    
+
     @BeforeClass(alwaysRun = true)
     public void setup() throws Exception {
 
@@ -166,7 +164,7 @@ public abstract class TestApiBase implements TestListenerStatus {
         final Injector g = getInjector();
 
         entitlementService = g.getInstance(EntitlementService.class);
-        EntitlementUserApi entApi = (EntitlementUserApi)g.getInstance(Key.get(EntitlementUserApi.class, RealImplementation.class));
+        final EntitlementUserApi entApi = (EntitlementUserApi) g.getInstance(Key.get(EntitlementUserApi.class, RealImplementation.class));
         entitlementApi = entApi;
         billingApi = g.getInstance(ChargeThruApi.class);
         migrationApi = g.getInstance(EntitlementMigrationApi.class);
@@ -184,7 +182,7 @@ public abstract class TestApiBase implements TestListenerStatus {
 
         setupDao();
 
-        ((DefaultCatalogService) catalogService).loadCatalog();        
+        ((DefaultCatalogService) catalogService).loadCatalog();
 
         accountData = getAccountData();
         assertNotNull(accountData);
@@ -203,10 +201,10 @@ public abstract class TestApiBase implements TestListenerStatus {
         }
     }
 
-    private static boolean isSqlTest(EntitlementDao theDao) {
-        return (! (theDao instanceof MockEntitlementDaoMemory));
+    private static boolean isSqlTest(final EntitlementDao theDao) {
+        return (!(theDao instanceof MockEntitlementDaoMemory));
     }
-   
+
     @BeforeMethod(alwaysRun = true)
     public void setupTest() throws Exception {
 
@@ -214,53 +212,53 @@ public abstract class TestApiBase implements TestListenerStatus {
 
         // CLEANUP ALL DB TABLES OR IN MEMORY STRUCTURES
         cleanupDao();
-        
+
         // RESET LIST OF EXPECTED EVENTS
         if (testListener != null) {
             testListener.reset();
             resetTestListenerStatus();
         }
-        
+
         // RESET CLOCK
         clock.resetDeltaFromReality();
 
         // START BUS AND REGISTER LISTENER
         busService.getBus().start();
         busService.getBus().register(testListener);
-        
+
         // START NOTIFICATION QUEUE FOR ENTITLEMENT
         ((Engine) entitlementService).initialize();
-        ((Engine)entitlementService).start();
-        
+        ((Engine) entitlementService).start();
+
         // SETUP START DATE
         clock.setDeltaFromReality(testStartDate.getMillis() - clock.getUTCNow().getMillis());
-        
+
         // CREATE NEW BUNDLE FOR TEST
-        UUID accountId = UUID.randomUUID();
+        final UUID accountId = UUID.randomUUID();
         bundle = entitlementApi.createBundleForAccount(accountId, "myDefaultBundle", context);
         assertNotNull(bundle);
     }
 
     @AfterMethod(alwaysRun = true)
     public void cleanupTest() throws Exception {
-        
+
         // UNREGISTER TEST LISTENER AND STOP BUS
         busService.getBus().unregister(testListener);
         busService.getBus().stop();
-        
+
         // STOP NOTIFICATION QUEUE
-        ((Engine)entitlementService).stop();
+        ((Engine) entitlementService).stop();
 
         log.warn("DONE WITH TEST\n");
     }
-    
+
     protected void assertListenerStatus() {
         if (isListenerFailed) {
             log.error(listenerFailedMsg);
             Assert.fail(listenerFailedMsg);
         }
     }
-    
+
     private void cleanupDao() {
         if (helper != null) {
             helper.cleanupAllTables();
@@ -270,29 +268,30 @@ public abstract class TestApiBase implements TestListenerStatus {
     }
 
     protected SubscriptionData createSubscription(final String productName, final BillingPeriod term, final String planSet, final DateTime requestedDate)
-        throws EntitlementUserApiException {
+            throws EntitlementUserApiException {
         return createSubscriptionWithBundle(bundle.getId(), productName, term, planSet, requestedDate);
     }
+
     protected SubscriptionData createSubscription(final String productName, final BillingPeriod term, final String planSet)
-    throws EntitlementUserApiException {
+            throws EntitlementUserApiException {
         return createSubscriptionWithBundle(bundle.getId(), productName, term, planSet, null);
     }
 
     protected SubscriptionData createSubscriptionWithBundle(final UUID bundleId, final String productName, final BillingPeriod term, final String planSet, final DateTime requestedDate)
-        throws EntitlementUserApiException {
-        
+            throws EntitlementUserApiException {
+
         testListener.pushExpectedEvent(NextEvent.CREATE);
-        SubscriptionData subscription = (SubscriptionData) entitlementApi.createSubscription(bundleId,
-                new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSet, null),
-                requestedDate == null ? clock.getUTCNow() : requestedDate, context);
+        final SubscriptionData subscription = (SubscriptionData) entitlementApi.createSubscription(bundleId,
+                                                                                             new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, planSet, null),
+                                                                                             requestedDate == null ? clock.getUTCNow() : requestedDate, context);
         assertNotNull(subscription);
         assertTrue(testListener.isCompleted(5000));
         return subscription;
     }
 
-    protected void checkNextPhaseChange(SubscriptionData subscription, int expPendingEvents, DateTime expPhaseChange) {
+    protected void checkNextPhaseChange(final SubscriptionData subscription, final int expPendingEvents, final DateTime expPhaseChange) {
 
-        List<EntitlementEvent> events = dao.getPendingEventsForSubscription(subscription.getId());
+        final List<EntitlementEvent> events = dao.getPendingEventsForSubscription(subscription.getId());
         assertNotNull(events);
         printEvents(events);
         assertEquals(events.size(), expPendingEvents);
@@ -300,13 +299,13 @@ public abstract class TestApiBase implements TestListenerStatus {
             boolean foundPhase = false;
             boolean foundChange = false;
 
-            for (EntitlementEvent cur : events) {
+            for (final EntitlementEvent cur : events) {
                 if (cur instanceof PhaseEvent) {
                     assertEquals(foundPhase, false);
                     foundPhase = true;
                     assertEquals(cur.getEffectiveDate(), expPhaseChange);
                 } else if (cur instanceof ApiEvent) {
-                    ApiEvent uEvent = (ApiEvent) cur;
+                    final ApiEvent uEvent = (ApiEvent) cur;
                     assertEquals(ApiEventType.CHANGE, uEvent.getEventType());
                     assertEquals(foundChange, false);
                     foundChange = true;
@@ -317,26 +316,28 @@ public abstract class TestApiBase implements TestListenerStatus {
         }
     }
 
-    protected void assertDateWithin(DateTime in, DateTime lower, DateTime upper) {
+    protected void assertDateWithin(final DateTime in, final DateTime lower, final DateTime upper) {
         assertTrue(in.isEqual(lower) || in.isAfter(lower));
         assertTrue(in.isEqual(upper) || in.isBefore(upper));
     }
 
     protected Duration getDurationDay(final int days) {
-        Duration result = new Duration() {
+        final Duration result = new Duration() {
             @Override
             public TimeUnit getUnit() {
                 return TimeUnit.DAYS;
             }
+
             @Override
             public int getNumber() {
                 return days;
             }
 
             @Override
-            public DateTime addToDateTime(DateTime dateTime) {
+            public DateTime addToDateTime(final DateTime dateTime) {
                 return null;
             }
+
             @Override
             public Period toJodaPeriod() {
                 throw new UnsupportedOperationException();
@@ -346,20 +347,22 @@ public abstract class TestApiBase implements TestListenerStatus {
     }
 
     protected Duration getDurationMonth(final int months) {
-        Duration result = new Duration() {
+        final Duration result = new Duration() {
             @Override
             public TimeUnit getUnit() {
                 return TimeUnit.MONTHS;
             }
+
             @Override
             public int getNumber() {
                 return months;
             }
 
             @Override
-            public DateTime addToDateTime(DateTime dateTime) {
+            public DateTime addToDateTime(final DateTime dateTime) {
                 return null;  //To change body of implemented methods use File | Settings | File Templates.
             }
+
             @Override
             public Period toJodaPeriod() {
                 throw new UnsupportedOperationException();
@@ -370,20 +373,22 @@ public abstract class TestApiBase implements TestListenerStatus {
 
 
     protected Duration getDurationYear(final int years) {
-        Duration result = new Duration() {
+        final Duration result = new Duration() {
             @Override
             public TimeUnit getUnit() {
                 return TimeUnit.YEARS;
             }
+
             @Override
             public int getNumber() {
                 return years;
             }
 
             @Override
-            public DateTime addToDateTime(DateTime dateTime) {
-                return dateTime.plusYears(years);  
+            public DateTime addToDateTime(final DateTime dateTime) {
+                return dateTime.plusYears(years);
             }
+
             @Override
             public Period toJodaPeriod() {
                 throw new UnsupportedOperationException();
@@ -393,7 +398,7 @@ public abstract class TestApiBase implements TestListenerStatus {
     }
 
     protected AccountData getAccountData() {
-        AccountData accountData = new AccountData() {
+        final AccountData accountData = new AccountData() {
             @Override
             public String getName() {
                 return "firstName lastName";
@@ -443,6 +448,7 @@ public abstract class TestApiBase implements TestListenerStatus {
             public UUID getPaymentMethodId() {
                 return UUID.randomUUID();
             }
+
             @Override
             public DateTimeZone getTimeZone() {
                 return DateTimeZone.forID("Europe/Paris");
@@ -497,14 +503,14 @@ public abstract class TestApiBase implements TestListenerStatus {
         return new PlanPhaseSpecifier(productName, ProductCategory.BASE, term, priceList, phaseType);
     }
 
-    protected void printEvents(List<EntitlementEvent> events) {
-        for (EntitlementEvent cur : events) {
+    protected void printEvents(final List<EntitlementEvent> events) {
+        for (final EntitlementEvent cur : events) {
             log.debug("Inspect event " + cur);
         }
     }
 
-    protected void printSubscriptionTransitions(List<SubscriptionEvent> transitions) {
-        for (SubscriptionEvent cur : transitions) {
+    protected void printSubscriptionTransitions(final List<SubscriptionEvent> transitions) {
+        for (final SubscriptionEvent cur : transitions) {
             log.debug("Transition " + cur);
         }
     }

diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/api/TestEventJson.java b/entitlement/src/test/java/com/ning/billing/entitlement/api/TestEventJson.java
index e50fd41..978c39b 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/api/TestEventJson.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/api/TestEventJson.java
@@ -17,7 +17,6 @@ package com.ning.billing.entitlement.api;
 
 import java.util.UUID;
 
-import com.ning.billing.util.jackson.ObjectMapper;
 import org.joda.time.DateTime;
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -27,37 +26,36 @@ import com.ning.billing.entitlement.api.timeline.RepairEntitlementEvent;
 import com.ning.billing.entitlement.api.user.DefaultSubscriptionEvent;
 import com.ning.billing.entitlement.api.user.Subscription.SubscriptionState;
 import com.ning.billing.entitlement.api.user.SubscriptionEvent;
+import com.ning.billing.util.jackson.ObjectMapper;
 
 public class TestEventJson {
     private final ObjectMapper mapper = new ObjectMapper();
 
-    @Test(groups= {"fast"})
+    @Test(groups = {"fast"})
     public void testSubscriptionEvent() throws Exception {
-        
 
-        SubscriptionEvent e = new DefaultSubscriptionEvent(UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID(), new DateTime(), new DateTime(),
-                SubscriptionState.ACTIVE, "pro", "TRIAL", "DEFAULT", SubscriptionState.CANCELLED, null, null, null, 3L, UUID.randomUUID(), SubscriptionTransitionType.CANCEL, 0, new DateTime());
-            
-        String json = mapper.writeValueAsString(e);
 
-        Class<?> claz = Class.forName(DefaultSubscriptionEvent.class.getName());
-        Object obj =  mapper.readValue(json, claz);
+        final SubscriptionEvent e = new DefaultSubscriptionEvent(UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID(), new DateTime(), new DateTime(),
+                                                           SubscriptionState.ACTIVE, "pro", "TRIAL", "DEFAULT", SubscriptionState.CANCELLED, null, null, null, 3L, UUID.randomUUID(), SubscriptionTransitionType.CANCEL, 0, new DateTime());
+
+        final String json = mapper.writeValueAsString(e);
+
+        final Class<?> claz = Class.forName(DefaultSubscriptionEvent.class.getName());
+        final Object obj = mapper.readValue(json, claz);
         Assert.assertTrue(obj.equals(e));
 
     }
-    
-    @Test(groups= {"fast"})
+
+    @Test(groups = {"fast"})
     public void testRepairEntitlementEvent() throws Exception {
-        RepairEntitlementEvent e = new DefaultRepairEntitlementEvent(UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID(), new DateTime());
-        
-        String json = mapper.writeValueAsString(e);
+        final RepairEntitlementEvent e = new DefaultRepairEntitlementEvent(UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID(), new DateTime());
+
+        final String json = mapper.writeValueAsString(e);
 
-        Class<?> claz = Class.forName(DefaultRepairEntitlementEvent.class.getName());
-        Object obj =  mapper.readValue(json, claz);
+        final Class<?> claz = Class.forName(DefaultRepairEntitlementEvent.class.getName());
+        final Object obj = mapper.readValue(json, claz);
         Assert.assertTrue(obj.equals(e));
     }
-        
 
-    
-    
+
 }

diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/api/timeline/TestApiBaseRepair.java b/entitlement/src/test/java/com/ning/billing/entitlement/api/timeline/TestApiBaseRepair.java
index 6ab5904..292dc37 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/api/timeline/TestApiBaseRepair.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/api/timeline/TestApiBaseRepair.java
@@ -15,8 +15,6 @@
  */
 package com.ning.billing.entitlement.api.timeline;
 
-import static org.testng.Assert.assertEquals;
-
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -27,7 +25,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
 
-
 import com.ning.billing.ErrorCode;
 import com.ning.billing.catalog.api.BillingPeriod;
 import com.ning.billing.catalog.api.PhaseType;
@@ -35,25 +32,24 @@ import com.ning.billing.catalog.api.PlanPhaseSpecifier;
 import com.ning.billing.catalog.api.ProductCategory;
 import com.ning.billing.entitlement.api.SubscriptionTransitionType;
 import com.ning.billing.entitlement.api.TestApiBase;
-import com.ning.billing.entitlement.api.timeline.BundleTimeline;
-import com.ning.billing.entitlement.api.timeline.EntitlementRepairException;
-import com.ning.billing.entitlement.api.timeline.SubscriptionTimeline;
 import com.ning.billing.entitlement.api.timeline.SubscriptionTimeline.DeletedEvent;
 import com.ning.billing.entitlement.api.timeline.SubscriptionTimeline.ExistingEvent;
 import com.ning.billing.entitlement.api.timeline.SubscriptionTimeline.NewEvent;
 import com.ning.billing.entitlement.api.user.EntitlementUserApiException;
 
+import static org.testng.Assert.assertEquals;
+
 
 public abstract class TestApiBaseRepair extends TestApiBase {
 
-    protected final static Logger log = LoggerFactory.getLogger(TestApiBaseRepair.class);
-    
+    protected static final Logger log = LoggerFactory.getLogger(TestApiBaseRepair.class);
+
     public interface TestWithExceptionCallback {
         public void doTest() throws EntitlementRepairException, EntitlementUserApiException;
     }
-    
+
     public static class TestWithException {
-        public void withException(TestWithExceptionCallback callback, ErrorCode code) throws Exception {
+        public void withException(final TestWithExceptionCallback callback, final ErrorCode code) throws Exception {
             try {
                 callback.doTest();
                 Assert.fail("Failed to catch exception " + code);
@@ -63,21 +59,24 @@ public abstract class TestApiBaseRepair extends TestApiBase {
         }
     }
 
-    
+
     protected SubscriptionTimeline createSubscriptionRepair(final UUID id, final List<DeletedEvent> deletedEvents, final List<NewEvent> newEvents) {
         return new SubscriptionTimeline() {
             @Override
             public UUID getId() {
                 return id;
             }
+
             @Override
             public List<NewEvent> getNewEvents() {
                 return newEvents;
             }
+
             @Override
             public List<ExistingEvent> getExistingEvents() {
                 return null;
             }
+
             @Override
             public List<DeletedEvent> getDeletedEvents() {
                 return deletedEvents;
@@ -91,14 +90,17 @@ public abstract class TestApiBaseRepair extends TestApiBase {
             public String getViewId() {
                 return viewId;
             }
+
             @Override
             public List<SubscriptionTimeline> getSubscriptions() {
                 return subscriptionRepair;
             }
+
             @Override
             public UUID getBundleId() {
                 return bundleId;
             }
+
             @Override
             public String getExternalKey() {
                 return null;
@@ -106,28 +108,32 @@ public abstract class TestApiBaseRepair extends TestApiBase {
         };
     }
 
-    protected ExistingEvent createExistingEventForAssertion(final SubscriptionTransitionType type, 
-            final String productName, final PhaseType phaseType, final ProductCategory category, final String priceListName, final BillingPeriod billingPeriod,
-            final DateTime effectiveDateTime) {
+    protected ExistingEvent createExistingEventForAssertion(final SubscriptionTransitionType type,
+                                                            final String productName, final PhaseType phaseType, final ProductCategory category, final String priceListName, final BillingPeriod billingPeriod,
+                                                            final DateTime effectiveDateTime) {
 
         final PlanPhaseSpecifier spec = new PlanPhaseSpecifier(productName, category, billingPeriod, priceListName, phaseType);
-        ExistingEvent ev = new ExistingEvent() {
+        final ExistingEvent ev = new ExistingEvent() {
             @Override
             public SubscriptionTransitionType getSubscriptionTransitionType() {
                 return type;
             }
-             @Override
+
+            @Override
             public DateTime getRequestedDate() {
-                 return null;
+                return null;
             }
+
             @Override
             public PlanPhaseSpecifier getPlanPhaseSpecifier() {
                 return spec;
             }
+
             @Override
             public UUID getEventId() {
                 return null;
             }
+
             @Override
             public DateTime getEffectiveDate() {
                 return effectiveDateTime;
@@ -135,9 +141,9 @@ public abstract class TestApiBaseRepair extends TestApiBase {
         };
         return ev;
     }
-    
+
     protected SubscriptionTimeline getSubscriptionRepair(final UUID id, final BundleTimeline bundleRepair) {
-        for (SubscriptionTimeline cur : bundleRepair.getSubscriptions()) {
+        for (final SubscriptionTimeline cur : bundleRepair.getSubscriptions()) {
             if (cur.getId().equals(id)) {
                 return cur;
             }
@@ -145,22 +151,23 @@ public abstract class TestApiBaseRepair extends TestApiBase {
         Assert.fail("Failed to find SubscriptionReapir " + id);
         return null;
     }
+
     protected void validateExistingEventForAssertion(final ExistingEvent expected, final ExistingEvent input) {
-        
+
         log.info(String.format("Got %s -> Expected %s", input.getPlanPhaseSpecifier().getProductName(), expected.getPlanPhaseSpecifier().getProductName()));
         assertEquals(input.getPlanPhaseSpecifier().getProductName(), expected.getPlanPhaseSpecifier().getProductName());
         log.info(String.format("Got %s -> Expected %s", input.getPlanPhaseSpecifier().getPhaseType(), expected.getPlanPhaseSpecifier().getPhaseType()));
         assertEquals(input.getPlanPhaseSpecifier().getPhaseType(), expected.getPlanPhaseSpecifier().getPhaseType());
         log.info(String.format("Got %s -> Expected %s", input.getPlanPhaseSpecifier().getProductCategory(), expected.getPlanPhaseSpecifier().getProductCategory()));
-        assertEquals(input.getPlanPhaseSpecifier().getProductCategory(), expected.getPlanPhaseSpecifier().getProductCategory());                    
+        assertEquals(input.getPlanPhaseSpecifier().getProductCategory(), expected.getPlanPhaseSpecifier().getProductCategory());
         log.info(String.format("Got %s -> Expected %s", input.getPlanPhaseSpecifier().getPriceListName(), expected.getPlanPhaseSpecifier().getPriceListName()));
-        assertEquals(input.getPlanPhaseSpecifier().getPriceListName(), expected.getPlanPhaseSpecifier().getPriceListName());                    
+        assertEquals(input.getPlanPhaseSpecifier().getPriceListName(), expected.getPlanPhaseSpecifier().getPriceListName());
         log.info(String.format("Got %s -> Expected %s", input.getPlanPhaseSpecifier().getBillingPeriod(), expected.getPlanPhaseSpecifier().getBillingPeriod()));
         assertEquals(input.getPlanPhaseSpecifier().getBillingPeriod(), expected.getPlanPhaseSpecifier().getBillingPeriod());
         log.info(String.format("Got %s -> Expected %s", input.getEffectiveDate(), expected.getEffectiveDate()));
-        assertEquals(input.getEffectiveDate(), expected.getEffectiveDate());        
+        assertEquals(input.getEffectiveDate(), expected.getEffectiveDate());
     }
-    
+
     protected DeletedEvent createDeletedEvent(final UUID eventId) {
         return new DeletedEvent() {
             @Override
@@ -177,10 +184,12 @@ public abstract class TestApiBaseRepair extends TestApiBase {
             public SubscriptionTransitionType getSubscriptionTransitionType() {
                 return type;
             }
+
             @Override
             public DateTime getRequestedDate() {
                 return requestedDate;
             }
+
             @Override
             public PlanPhaseSpecifier getPlanPhaseSpecifier() {
                 return spec;
@@ -192,7 +201,7 @@ public abstract class TestApiBaseRepair extends TestApiBase {
         if (bundle.getSubscriptions() == null) {
             return;
         }
-        for (SubscriptionTimeline cur : bundle.getSubscriptions()) {
+        for (final SubscriptionTimeline cur : bundle.getSubscriptions()) {
             if (cur.getExistingEvents() != null) {
                 sortExistingEvent(cur.getExistingEvents());
             }
@@ -205,15 +214,16 @@ public abstract class TestApiBaseRepair extends TestApiBase {
     protected void sortExistingEvent(final List<ExistingEvent> events) {
         Collections.sort(events, new Comparator<ExistingEvent>() {
             @Override
-            public int compare(ExistingEvent arg0, ExistingEvent arg1) {
+            public int compare(final ExistingEvent arg0, final ExistingEvent arg1) {
                 return arg0.getEffectiveDate().compareTo(arg1.getEffectiveDate());
             }
         });
     }
+
     protected void sortNewEvent(final List<NewEvent> events) {
         Collections.sort(events, new Comparator<NewEvent>() {
             @Override
-            public int compare(NewEvent arg0, NewEvent arg1) {
+            public int compare(final NewEvent arg0, final NewEvent arg1) {
                 return arg0.getRequestedDate().compareTo(arg1.getRequestedDate());
             }
         });

diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/api/timeline/TestRepairBP.java b/entitlement/src/test/java/com/ning/billing/entitlement/api/timeline/TestRepairBP.java
index e001fe2..af685e4 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/api/timeline/TestRepairBP.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/api/timeline/TestRepairBP.java
@@ -15,11 +15,6 @@
  */
 package com.ning.billing.entitlement.api.timeline;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
@@ -52,6 +47,11 @@ import com.ning.billing.entitlement.api.user.SubscriptionData;
 import com.ning.billing.entitlement.api.user.SubscriptionEvents;
 import com.ning.billing.entitlement.glue.MockEngineModuleSql;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+
 public class TestRepairBP extends TestApiBaseRepair {
 
     @Override
@@ -59,294 +59,294 @@ public class TestRepairBP extends TestApiBaseRepair {
         return Guice.createInjector(Stage.DEVELOPMENT, new MockEngineModuleSql());
     }
 
-    @Test(groups={"slow"})
-    public void testFetchBundleRepair() throws Exception  {
+    @Test(groups = {"slow"})
+    public void testFetchBundleRepair() throws Exception {
 
         log.info("Starting testFetchBundleRepair");
-        
-        String baseProduct = "Shotgun";
-        BillingPeriod baseTerm = BillingPeriod.MONTHLY;
-        String basePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
+
+        final String baseProduct = "Shotgun";
+        final BillingPeriod baseTerm = BillingPeriod.MONTHLY;
+        final String basePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
 
         // CREATE BP
-        Subscription baseSubscription = createSubscription(baseProduct, baseTerm, basePriceList);
+        final Subscription baseSubscription = createSubscription(baseProduct, baseTerm, basePriceList);
 
-        String aoProduct = "Telescopic-Scope";
-        BillingPeriod aoTerm = BillingPeriod.MONTHLY;
-        String aoPriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
+        final String aoProduct = "Telescopic-Scope";
+        final BillingPeriod aoTerm = BillingPeriod.MONTHLY;
+        final String aoPriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
 
-        SubscriptionData aoSubscription = createSubscription(aoProduct, aoTerm, aoPriceList);
+        final SubscriptionData aoSubscription = createSubscription(aoProduct, aoTerm, aoPriceList);
 
-        BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
-        List<SubscriptionTimeline> subscriptionRepair = bundleRepair.getSubscriptions();
+        final BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
+        final List<SubscriptionTimeline> subscriptionRepair = bundleRepair.getSubscriptions();
         assertEquals(subscriptionRepair.size(), 2);
 
-        for (SubscriptionTimeline cur : subscriptionRepair) {
+        for (final SubscriptionTimeline cur : subscriptionRepair) {
             assertNull(cur.getDeletedEvents());
-            assertNull(cur.getNewEvents());                
+            assertNull(cur.getNewEvents());
 
-            List<ExistingEvent> events = cur.getExistingEvents();
+            final List<ExistingEvent> events = cur.getExistingEvents();
             assertEquals(events.size(), 2);
             sortExistingEvent(events);
 
             assertEquals(events.get(0).getSubscriptionTransitionType(), SubscriptionTransitionType.CREATE);
-            assertEquals(events.get(1).getSubscriptionTransitionType(), SubscriptionTransitionType.PHASE);                    
+            assertEquals(events.get(1).getSubscriptionTransitionType(), SubscriptionTransitionType.PHASE);
             final boolean isBP = cur.getId().equals(baseSubscription.getId());
             if (isBP) {
                 assertEquals(cur.getId(), baseSubscription.getId());
 
                 assertEquals(events.get(0).getPlanPhaseSpecifier().getProductName(), baseProduct);
                 assertEquals(events.get(0).getPlanPhaseSpecifier().getPhaseType(), PhaseType.TRIAL);
-                assertEquals(events.get(0).getPlanPhaseSpecifier().getProductCategory(),ProductCategory.BASE);                    
-                assertEquals(events.get(0).getPlanPhaseSpecifier().getPriceListName(), basePriceList);                    
+                assertEquals(events.get(0).getPlanPhaseSpecifier().getProductCategory(), ProductCategory.BASE);
+                assertEquals(events.get(0).getPlanPhaseSpecifier().getPriceListName(), basePriceList);
                 assertEquals(events.get(0).getPlanPhaseSpecifier().getBillingPeriod(), BillingPeriod.NO_BILLING_PERIOD);
 
                 assertEquals(events.get(1).getPlanPhaseSpecifier().getProductName(), baseProduct);
                 assertEquals(events.get(1).getPlanPhaseSpecifier().getPhaseType(), PhaseType.EVERGREEN);
-                assertEquals(events.get(1).getPlanPhaseSpecifier().getProductCategory(),ProductCategory.BASE);                    
-                assertEquals(events.get(1).getPlanPhaseSpecifier().getPriceListName(), basePriceList);                    
+                assertEquals(events.get(1).getPlanPhaseSpecifier().getProductCategory(), ProductCategory.BASE);
+                assertEquals(events.get(1).getPlanPhaseSpecifier().getPriceListName(), basePriceList);
                 assertEquals(events.get(1).getPlanPhaseSpecifier().getBillingPeriod(), baseTerm);
             } else {
                 assertEquals(cur.getId(), aoSubscription.getId());
 
                 assertEquals(events.get(0).getPlanPhaseSpecifier().getProductName(), aoProduct);
-                assertEquals(events.get(0).getPlanPhaseSpecifier().getPhaseType(), PhaseType.DISCOUNT);                    
-                assertEquals(events.get(0).getPlanPhaseSpecifier().getProductCategory(),ProductCategory.ADD_ON); 
-                assertEquals(events.get(0).getPlanPhaseSpecifier().getPriceListName(), aoPriceList); 
-                assertEquals(events.get(1).getPlanPhaseSpecifier().getBillingPeriod(), aoTerm);                    
+                assertEquals(events.get(0).getPlanPhaseSpecifier().getPhaseType(), PhaseType.DISCOUNT);
+                assertEquals(events.get(0).getPlanPhaseSpecifier().getProductCategory(), ProductCategory.ADD_ON);
+                assertEquals(events.get(0).getPlanPhaseSpecifier().getPriceListName(), aoPriceList);
+                assertEquals(events.get(1).getPlanPhaseSpecifier().getBillingPeriod(), aoTerm);
 
                 assertEquals(events.get(1).getPlanPhaseSpecifier().getProductName(), aoProduct);
-                assertEquals(events.get(1).getPlanPhaseSpecifier().getPhaseType(), PhaseType.EVERGREEN);                    
-                assertEquals(events.get(1).getPlanPhaseSpecifier().getProductCategory(),ProductCategory.ADD_ON); 
-                assertEquals(events.get(1).getPlanPhaseSpecifier().getPriceListName(), aoPriceList);  
-                assertEquals(events.get(1).getPlanPhaseSpecifier().getBillingPeriod(), aoTerm);                    
+                assertEquals(events.get(1).getPlanPhaseSpecifier().getPhaseType(), PhaseType.EVERGREEN);
+                assertEquals(events.get(1).getPlanPhaseSpecifier().getProductCategory(), ProductCategory.ADD_ON);
+                assertEquals(events.get(1).getPlanPhaseSpecifier().getPriceListName(), aoPriceList);
+                assertEquals(events.get(1).getPlanPhaseSpecifier().getBillingPeriod(), aoTerm);
             }
         }
         assertListenerStatus();
     }
-    
+
     //TODO MDW: Temporary disable need to look at this with Stephane
-    @Test(groups={"slow"}, enabled = false)
+    @Test(groups = {"slow"}, enabled = false)
     public void testBPRepairWithCancellationOnstart() throws Exception {
 
         log.info("Starting testBPRepairWithCancellationOnstart");
-        
-        String baseProduct = "Shotgun";
-        DateTime startDate = clock.getUTCNow();
-         
+
+        final String baseProduct = "Shotgun";
+        final DateTime startDate = clock.getUTCNow();
+
         // CREATE BP
-        Subscription baseSubscription = createSubscription(baseProduct, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, startDate);
+        final Subscription baseSubscription = createSubscription(baseProduct, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, startDate);
 
         // Stays in trial-- for instance
-        Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(10));
+        final Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(10));
         clock.addDeltaFromReality(it.toDurationMillis());
 
-        BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
+        final BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
         sortEventsOnBundle(bundleRepair);
 
-        List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
+        final List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
         des.add(createDeletedEvent(bundleRepair.getSubscriptions().get(0).getExistingEvents().get(1).getEventId()));
-        NewEvent ne = createNewEvent(SubscriptionTransitionType.CANCEL, baseSubscription.getStartDate(), null);
+        final NewEvent ne = createNewEvent(SubscriptionTransitionType.CANCEL, baseSubscription.getStartDate(), null);
+
+        final SubscriptionTimeline sRepair = createSubscriptionRepair(baseSubscription.getId(), des, Collections.singletonList(ne));
 
-        SubscriptionTimeline sRepair = createSubscriptionRepair(baseSubscription.getId(), des, Collections.singletonList(ne));
-        
         // FIRST ISSUE DRY RUN
-        BundleTimeline bRepair =  createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(sRepair));
-        
+        final BundleTimeline bRepair = createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(sRepair));
+
         boolean dryRun = true;
-        BundleTimeline dryRunBundleRepair = repairApi.repairBundle(bRepair, dryRun, context);
+        final BundleTimeline dryRunBundleRepair = repairApi.repairBundle(bRepair, dryRun, context);
         sortEventsOnBundle(dryRunBundleRepair);
         List<SubscriptionTimeline> subscriptionRepair = dryRunBundleRepair.getSubscriptions();
         assertEquals(subscriptionRepair.size(), 1);
         SubscriptionTimeline cur = subscriptionRepair.get(0);
         int index = 0;
-        List<ExistingEvent> events = subscriptionRepair.get(0).getExistingEvents();
+        final List<ExistingEvent> events = subscriptionRepair.get(0).getExistingEvents();
         assertEquals(events.size(), 2);
-        List<ExistingEvent> expected = new LinkedList<SubscriptionTimeline.ExistingEvent>();
+        final List<ExistingEvent> expected = new LinkedList<SubscriptionTimeline.ExistingEvent>();
         expected.add(createExistingEventForAssertion(SubscriptionTransitionType.CREATE, baseProduct, PhaseType.TRIAL,
-                ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.NO_BILLING_PERIOD, baseSubscription.getStartDate()));
+                                                     ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.NO_BILLING_PERIOD, baseSubscription.getStartDate()));
         expected.add(createExistingEventForAssertion(SubscriptionTransitionType.CANCEL, baseProduct, PhaseType.TRIAL,
-                ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.NO_BILLING_PERIOD,baseSubscription.getStartDate()));
+                                                     ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.NO_BILLING_PERIOD, baseSubscription.getStartDate()));
 
-        for (ExistingEvent e : expected) {
-           validateExistingEventForAssertion(e, events.get(index++));           
+        for (final ExistingEvent e : expected) {
+            validateExistingEventForAssertion(e, events.get(index++));
         }
-        
-        SubscriptionData dryRunBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId());
-        
+
+        final SubscriptionData dryRunBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId());
+
         assertEquals(dryRunBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
         assertEquals(dryRunBaseSubscription.getBundleId(), bundle.getId());
         assertEquals(dryRunBaseSubscription.getStartDate(), baseSubscription.getStartDate());
 
-        Plan currentPlan = dryRunBaseSubscription.getCurrentPlan();
+        final Plan currentPlan = dryRunBaseSubscription.getCurrentPlan();
         assertNotNull(currentPlan);
         assertEquals(currentPlan.getProduct().getName(), baseProduct);
         assertEquals(currentPlan.getProduct().getCategory(), ProductCategory.BASE);
         assertEquals(currentPlan.getBillingPeriod(), BillingPeriod.MONTHLY);
 
-        PlanPhase currentPhase = dryRunBaseSubscription.getCurrentPhase();
+        final PlanPhase currentPhase = dryRunBaseSubscription.getCurrentPhase();
         assertNotNull(currentPhase);
         assertEquals(currentPhase.getPhaseType(), PhaseType.TRIAL);
-        
-       // SECOND RE-ISSUE CALL-- NON DRY RUN
+
+        // SECOND RE-ISSUE CALL-- NON DRY RUN
         dryRun = false;
         testListener.pushExpectedEvent(NextEvent.REPAIR_BUNDLE);
-        BundleTimeline realRunBundleRepair = repairApi.repairBundle(bRepair, dryRun, context);
+        final BundleTimeline realRunBundleRepair = repairApi.repairBundle(bRepair, dryRun, context);
         assertTrue(testListener.isCompleted(5000));
-        
+
         subscriptionRepair = realRunBundleRepair.getSubscriptions();
         assertEquals(subscriptionRepair.size(), 1);
         cur = subscriptionRepair.get(0);
         assertEquals(cur.getId(), baseSubscription.getId());
         index = 0;
-        for (ExistingEvent e : expected) {
-           validateExistingEventForAssertion(e, events.get(index++));           
+        for (final ExistingEvent e : expected) {
+            validateExistingEventForAssertion(e, events.get(index++));
         }
-        SubscriptionData realRunBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId());
+        final SubscriptionData realRunBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId());
         assertEquals(realRunBaseSubscription.getAllTransitions().size(), 2);
-        
-        
+
+
         assertEquals(realRunBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
         assertEquals(realRunBaseSubscription.getBundleId(), bundle.getId());
         assertEquals(realRunBaseSubscription.getStartDate(), startDate);
 
         assertEquals(realRunBaseSubscription.getState(), SubscriptionState.CANCELLED);
-        
+
         assertListenerStatus();
     }
-    
-    @Test(groups={"slow"})
+
+    @Test(groups = {"slow"})
     public void testBPRepairReplaceCreateBeforeTrial() throws Exception {
-        
+
         log.info("Starting testBPRepairReplaceCreateBeforeTrial");
-        
-        String baseProduct = "Shotgun";
-        String newBaseProduct = "Assault-Rifle";
-        
-        DateTime startDate = clock.getUTCNow();
-        int clockShift = -1;
-        DateTime restartDate =  startDate.plusDays(clockShift).minusDays(1);
-        LinkedList<ExistingEvent> expected = new LinkedList<SubscriptionTimeline.ExistingEvent>();
-        
+
+        final String baseProduct = "Shotgun";
+        final String newBaseProduct = "Assault-Rifle";
+
+        final DateTime startDate = clock.getUTCNow();
+        final int clockShift = -1;
+        final DateTime restartDate = startDate.plusDays(clockShift).minusDays(1);
+        final LinkedList<ExistingEvent> expected = new LinkedList<SubscriptionTimeline.ExistingEvent>();
+
         expected.add(createExistingEventForAssertion(SubscriptionTransitionType.CREATE, newBaseProduct, PhaseType.TRIAL,
-                ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.NO_BILLING_PERIOD, restartDate));
+                                                     ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.NO_BILLING_PERIOD, restartDate));
         expected.add(createExistingEventForAssertion(SubscriptionTransitionType.PHASE, newBaseProduct, PhaseType.EVERGREEN,
-                    ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, restartDate.plusDays(30)));
+                                                     ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, restartDate.plusDays(30)));
 
         testBPRepairCreate(true, startDate, clockShift, baseProduct, newBaseProduct, expected);
         assertListenerStatus();
     }
 
-    @Test(groups={"slow"}, enabled=true)
+    @Test(groups = {"slow"}, enabled = true)
     public void testBPRepairReplaceCreateInTrial() throws Exception {
-        
+
         log.info("Starting testBPRepairReplaceCreateInTrial");
-        
-        String baseProduct = "Shotgun";
-        String newBaseProduct = "Assault-Rifle";
-        
-        DateTime startDate = clock.getUTCNow();
-        int clockShift = 10;
-        DateTime restartDate =  startDate.plusDays(clockShift).minusDays(1);
-        LinkedList<ExistingEvent> expected = new LinkedList<SubscriptionTimeline.ExistingEvent>();
-        
+
+        final String baseProduct = "Shotgun";
+        final String newBaseProduct = "Assault-Rifle";
+
+        final DateTime startDate = clock.getUTCNow();
+        final int clockShift = 10;
+        final DateTime restartDate = startDate.plusDays(clockShift).minusDays(1);
+        final LinkedList<ExistingEvent> expected = new LinkedList<SubscriptionTimeline.ExistingEvent>();
+
         expected.add(createExistingEventForAssertion(SubscriptionTransitionType.CREATE, newBaseProduct, PhaseType.TRIAL,
-                ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.NO_BILLING_PERIOD, restartDate));
+                                                     ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.NO_BILLING_PERIOD, restartDate));
         expected.add(createExistingEventForAssertion(SubscriptionTransitionType.PHASE, newBaseProduct, PhaseType.EVERGREEN,
-                    ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, restartDate.plusDays(30)));
+                                                     ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, restartDate.plusDays(30)));
+
+        final UUID baseSubscriptionId = testBPRepairCreate(true, startDate, clockShift, baseProduct, newBaseProduct, expected);
 
-        UUID baseSubscriptionId = testBPRepairCreate(true, startDate, clockShift, baseProduct, newBaseProduct, expected);
-        
         testListener.pushExpectedEvent(NextEvent.PHASE);
-        Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(32));
+        final Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(32));
         clock.addDeltaFromReality(it.toDurationMillis());
         assertTrue(testListener.isCompleted(5000));
-        
+
         // CHECK WHAT"S GOING ON AFTER WE MOVE CLOCK-- FUTURE MOTIFICATION SHOULD KICK IN
-        SubscriptionData subscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscriptionId);
-        
+        final SubscriptionData subscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscriptionId);
+
         assertEquals(subscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
         assertEquals(subscription.getBundleId(), bundle.getId());
         assertEquals(subscription.getStartDate(), restartDate);
-        assertEquals(subscription.getBundleStartDate(), restartDate);        
+        assertEquals(subscription.getBundleStartDate(), restartDate);
 
-        Plan currentPlan = subscription.getCurrentPlan();
+        final Plan currentPlan = subscription.getCurrentPlan();
         assertNotNull(currentPlan);
         assertEquals(currentPlan.getProduct().getName(), newBaseProduct);
         assertEquals(currentPlan.getProduct().getCategory(), ProductCategory.BASE);
         assertEquals(currentPlan.getBillingPeriod(), BillingPeriod.MONTHLY);
 
-        PlanPhase currentPhase = subscription.getCurrentPhase();
+        final PlanPhase currentPhase = subscription.getCurrentPhase();
         assertNotNull(currentPhase);
         assertEquals(currentPhase.getPhaseType(), PhaseType.EVERGREEN);
-        
+
         assertListenerStatus();
     }
 
-    
-    @Test(groups={"slow"})
+
+    @Test(groups = {"slow"})
     public void testBPRepairReplaceCreateAfterTrial() throws Exception {
-        
+
         log.info("Starting testBPRepairReplaceCreateAfterTrial");
-        
-        String baseProduct = "Shotgun";
-        String newBaseProduct = "Assault-Rifle";
-        
-        DateTime startDate = clock.getUTCNow();
-        int clockShift = 40;
-        DateTime restartDate =  startDate.plusDays(clockShift).minusDays(1);
-        LinkedList<ExistingEvent> expected = new LinkedList<SubscriptionTimeline.ExistingEvent>();
-        
+
+        final String baseProduct = "Shotgun";
+        final String newBaseProduct = "Assault-Rifle";
+
+        final DateTime startDate = clock.getUTCNow();
+        final int clockShift = 40;
+        final DateTime restartDate = startDate.plusDays(clockShift).minusDays(1);
+        final LinkedList<ExistingEvent> expected = new LinkedList<SubscriptionTimeline.ExistingEvent>();
+
         expected.add(createExistingEventForAssertion(SubscriptionTransitionType.CREATE, newBaseProduct, PhaseType.TRIAL,
-                ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.NO_BILLING_PERIOD, restartDate));
+                                                     ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.NO_BILLING_PERIOD, restartDate));
         expected.add(createExistingEventForAssertion(SubscriptionTransitionType.PHASE, newBaseProduct, PhaseType.EVERGREEN,
-                    ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, restartDate.plusDays(30)));
+                                                     ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, restartDate.plusDays(30)));
 
         testBPRepairCreate(false, startDate, clockShift, baseProduct, newBaseProduct, expected);
         assertListenerStatus();
     }
-    
-    
-    private UUID testBPRepairCreate(boolean inTrial, DateTime startDate, int clockShift, 
-            String baseProduct, String newBaseProduct, List<ExistingEvent> expectedEvents) throws Exception {
+
+
+    private UUID testBPRepairCreate(final boolean inTrial, final DateTime startDate, final int clockShift,
+                                    final String baseProduct, final String newBaseProduct, final List<ExistingEvent> expectedEvents) throws Exception {
 
         log.info("Starting testBPRepairCreate");
-        
+
         // CREATE BP
-        Subscription baseSubscription = createSubscription(baseProduct, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, startDate);
+        final Subscription baseSubscription = createSubscription(baseProduct, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, startDate);
 
         // MOVE CLOCK
         if (clockShift > 0) {
             if (!inTrial) {
                 testListener.pushExpectedEvent(NextEvent.PHASE);
-            }               
-            
-            Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(clockShift));
+            }
+
+            final Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(clockShift));
             clock.addDeltaFromReality(it.toDurationMillis());
             if (!inTrial) {
                 assertTrue(testListener.isCompleted(5000));
             }
         }
 
-        BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
+        final BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
         sortEventsOnBundle(bundleRepair);
-        
-        DateTime newCreateTime = baseSubscription.getStartDate().plusDays(clockShift - 1);
 
-        PlanPhaseSpecifier spec = new PlanPhaseSpecifier(newBaseProduct, ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.TRIAL);
+        final DateTime newCreateTime = baseSubscription.getStartDate().plusDays(clockShift - 1);
+
+        final PlanPhaseSpecifier spec = new PlanPhaseSpecifier(newBaseProduct, ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.TRIAL);
 
-        NewEvent ne = createNewEvent(SubscriptionTransitionType.CREATE, newCreateTime, spec);
-        List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
+        final NewEvent ne = createNewEvent(SubscriptionTransitionType.CREATE, newCreateTime, spec);
+        final List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
         des.add(createDeletedEvent(bundleRepair.getSubscriptions().get(0).getExistingEvents().get(0).getEventId()));
         des.add(createDeletedEvent(bundleRepair.getSubscriptions().get(0).getExistingEvents().get(1).getEventId()));
 
-        SubscriptionTimeline sRepair = createSubscriptionRepair(baseSubscription.getId(), des, Collections.singletonList(ne));
-        
+        final SubscriptionTimeline sRepair = createSubscriptionRepair(baseSubscription.getId(), des, Collections.singletonList(ne));
+
         // FIRST ISSUE DRY RUN
-        BundleTimeline bRepair =  createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(sRepair));
-        
-        boolean dryRun = true;        
-        BundleTimeline dryRunBundleRepair = repairApi.repairBundle(bRepair, dryRun, context);
+        final BundleTimeline bRepair = createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(sRepair));
+
+        boolean dryRun = true;
+        final BundleTimeline dryRunBundleRepair = repairApi.repairBundle(bRepair, dryRun, context);
         List<SubscriptionTimeline> subscriptionRepair = dryRunBundleRepair.getSubscriptions();
         assertEquals(subscriptionRepair.size(), 1);
         SubscriptionTimeline cur = subscriptionRepair.get(0);
@@ -355,11 +355,11 @@ public class TestRepairBP extends TestApiBaseRepair {
         List<ExistingEvent> events = cur.getExistingEvents();
         assertEquals(expectedEvents.size(), events.size());
         int index = 0;
-        for (ExistingEvent e : expectedEvents) {
-           validateExistingEventForAssertion(e, events.get(index++));           
+        for (final ExistingEvent e : expectedEvents) {
+            validateExistingEventForAssertion(e, events.get(index++));
         }
-        SubscriptionData dryRunBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId());
-        
+        final SubscriptionData dryRunBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId());
+
         assertEquals(dryRunBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
         assertEquals(dryRunBaseSubscription.getBundleId(), bundle.getId());
         assertEquals(dryRunBaseSubscription.getStartDate(), baseSubscription.getStartDate());
@@ -377,11 +377,11 @@ public class TestRepairBP extends TestApiBaseRepair {
         } else {
             assertEquals(currentPhase.getPhaseType(), PhaseType.EVERGREEN);
         }
-        
-       // SECOND RE-ISSUE CALL-- NON DRY RUN
+
+        // SECOND RE-ISSUE CALL-- NON DRY RUN
         dryRun = false;
         testListener.pushExpectedEvent(NextEvent.REPAIR_BUNDLE);
-        BundleTimeline realRunBundleRepair = repairApi.repairBundle(bRepair, dryRun, context);
+        final BundleTimeline realRunBundleRepair = repairApi.repairBundle(bRepair, dryRun, context);
         assertTrue(testListener.isCompleted(5000));
         subscriptionRepair = realRunBundleRepair.getSubscriptions();
         assertEquals(subscriptionRepair.size(), 1);
@@ -389,18 +389,18 @@ public class TestRepairBP extends TestApiBaseRepair {
         assertEquals(cur.getId(), baseSubscription.getId());
 
         events = cur.getExistingEvents();
-        for (ExistingEvent e : events) {
-            log.info(String.format("%s, %s, %s, %s", e.getSubscriptionTransitionType(), e.getEffectiveDate(), e.getPlanPhaseSpecifier().getProductName(),  e.getPlanPhaseSpecifier().getPhaseType()));
+        for (final ExistingEvent e : events) {
+            log.info(String.format("%s, %s, %s, %s", e.getSubscriptionTransitionType(), e.getEffectiveDate(), e.getPlanPhaseSpecifier().getProductName(), e.getPlanPhaseSpecifier().getPhaseType()));
         }
         assertEquals(events.size(), expectedEvents.size());
         index = 0;
-        for (ExistingEvent e : expectedEvents) {
-           validateExistingEventForAssertion(e, events.get(index++));           
+        for (final ExistingEvent e : expectedEvents) {
+            validateExistingEventForAssertion(e, events.get(index++));
         }
-        SubscriptionData realRunBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId());
+        final SubscriptionData realRunBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId());
         assertEquals(realRunBaseSubscription.getAllTransitions().size(), 2);
-        
-        
+
+
         assertEquals(realRunBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
         assertEquals(realRunBaseSubscription.getBundleId(), bundle.getId());
         assertEquals(realRunBaseSubscription.getStartDate(), newCreateTime);
@@ -414,133 +414,133 @@ public class TestRepairBP extends TestApiBaseRepair {
         currentPhase = realRunBaseSubscription.getCurrentPhase();
         assertNotNull(currentPhase);
         assertEquals(currentPhase.getPhaseType(), PhaseType.TRIAL);
-        
+
         return baseSubscription.getId();
     }
 
-    @Test(groups={"slow"})
+    @Test(groups = {"slow"})
     public void testBPRepairAddChangeInTrial() throws Exception {
-        
+
         log.info("Starting testBPRepairAddChangeInTrial");
-        
-        String baseProduct = "Shotgun";
-        String newBaseProduct = "Assault-Rifle";
-        
-        DateTime startDate = clock.getUTCNow();
-        int clockShift = 10;
-        DateTime changeDate =  startDate.plusDays(clockShift).minusDays(1);
-        LinkedList<ExistingEvent> expected = new LinkedList<SubscriptionTimeline.ExistingEvent>();
-        
+
+        final String baseProduct = "Shotgun";
+        final String newBaseProduct = "Assault-Rifle";
+
+        final DateTime startDate = clock.getUTCNow();
+        final int clockShift = 10;
+        final DateTime changeDate = startDate.plusDays(clockShift).minusDays(1);
+        final LinkedList<ExistingEvent> expected = new LinkedList<SubscriptionTimeline.ExistingEvent>();
+
         expected.add(createExistingEventForAssertion(SubscriptionTransitionType.CREATE, baseProduct, PhaseType.TRIAL,
-                ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.NO_BILLING_PERIOD, startDate));
+                                                     ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.NO_BILLING_PERIOD, startDate));
         expected.add(createExistingEventForAssertion(SubscriptionTransitionType.CHANGE, newBaseProduct, PhaseType.TRIAL,
-                    ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.NO_BILLING_PERIOD, changeDate));
+                                                     ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.NO_BILLING_PERIOD, changeDate));
         expected.add(createExistingEventForAssertion(SubscriptionTransitionType.PHASE, newBaseProduct, PhaseType.EVERGREEN,
-                    ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, startDate.plusDays(30)));
+                                                     ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, startDate.plusDays(30)));
+
+        final UUID baseSubscriptionId = testBPRepairAddChange(true, startDate, clockShift, baseProduct, newBaseProduct, expected, 3);
 
-        UUID baseSubscriptionId = testBPRepairAddChange(true, startDate, clockShift, baseProduct, newBaseProduct, expected, 3);
-        
         // CHECK WHAT"S GOING ON AFTER WE MOVE CLOCK-- FUTURE MOTIFICATION SHOULD KICK IN
         testListener.pushExpectedEvent(NextEvent.PHASE);
-        Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(32));
+        final Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(32));
         clock.addDeltaFromReality(it.toDurationMillis());
         assertTrue(testListener.isCompleted(5000));
-        SubscriptionData subscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscriptionId);
-        
+        final SubscriptionData subscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscriptionId);
+
         assertEquals(subscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
         assertEquals(subscription.getBundleId(), bundle.getId());
         assertEquals(subscription.getStartDate(), startDate);
-        assertEquals(subscription.getBundleStartDate(), startDate);        
+        assertEquals(subscription.getBundleStartDate(), startDate);
 
-        Plan currentPlan = subscription.getCurrentPlan();
+        final Plan currentPlan = subscription.getCurrentPlan();
         assertNotNull(currentPlan);
         assertEquals(currentPlan.getProduct().getName(), newBaseProduct);
         assertEquals(currentPlan.getProduct().getCategory(), ProductCategory.BASE);
         assertEquals(currentPlan.getBillingPeriod(), BillingPeriod.MONTHLY);
 
-        PlanPhase currentPhase = subscription.getCurrentPhase();
+        final PlanPhase currentPhase = subscription.getCurrentPhase();
         assertNotNull(currentPhase);
         assertEquals(currentPhase.getPhaseType(), PhaseType.EVERGREEN);
-        
+
         assertListenerStatus();
     }
 
-    @Test(groups={"slow"})
+    @Test(groups = {"slow"})
     public void testBPRepairAddChangeAfterTrial() throws Exception {
-        
+
         log.info("Starting testBPRepairAddChangeAfterTrial");
-        
-        String baseProduct = "Shotgun";
-        String newBaseProduct = "Assault-Rifle";
-        
-        DateTime startDate = clock.getUTCNow();
-        int clockShift = 40;
-        DateTime changeDate =  startDate.plusDays(clockShift).minusDays(1);
-        
-        LinkedList<ExistingEvent> expected = new LinkedList<SubscriptionTimeline.ExistingEvent>();
+
+        final String baseProduct = "Shotgun";
+        final String newBaseProduct = "Assault-Rifle";
+
+        final DateTime startDate = clock.getUTCNow();
+        final int clockShift = 40;
+        final DateTime changeDate = startDate.plusDays(clockShift).minusDays(1);
+
+        final LinkedList<ExistingEvent> expected = new LinkedList<SubscriptionTimeline.ExistingEvent>();
         expected.add(createExistingEventForAssertion(SubscriptionTransitionType.CREATE, baseProduct, PhaseType.TRIAL,
-                ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.NO_BILLING_PERIOD, startDate));
+                                                     ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.NO_BILLING_PERIOD, startDate));
         expected.add(createExistingEventForAssertion(SubscriptionTransitionType.PHASE, baseProduct, PhaseType.EVERGREEN,
-                ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, startDate.plusDays(30)));
+                                                     ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, startDate.plusDays(30)));
         expected.add(createExistingEventForAssertion(SubscriptionTransitionType.CHANGE, newBaseProduct, PhaseType.EVERGREEN,
-                ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, changeDate));
+                                                     ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, changeDate));
         testBPRepairAddChange(false, startDate, clockShift, baseProduct, newBaseProduct, expected, 3);
-    
+
         assertListenerStatus();
     }
-    
 
-    private UUID testBPRepairAddChange(boolean inTrial, DateTime startDate, int clockShift, 
-            String baseProduct, String newBaseProduct, List<ExistingEvent> expectedEvents, int expectedTransitions) throws Exception {
 
-        
+    private UUID testBPRepairAddChange(final boolean inTrial, final DateTime startDate, final int clockShift,
+                                       final String baseProduct, final String newBaseProduct, final List<ExistingEvent> expectedEvents, final int expectedTransitions) throws Exception {
+
+
         // CREATE BP
-        Subscription baseSubscription = createSubscription(baseProduct, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, startDate);
+        final Subscription baseSubscription = createSubscription(baseProduct, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, startDate);
 
         // MOVE CLOCK
         if (!inTrial) {
             testListener.pushExpectedEvent(NextEvent.PHASE);
-        }               
-        
-        Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(clockShift));
+        }
+
+        final Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(clockShift));
         clock.addDeltaFromReality(it.toDurationMillis());
         if (!inTrial) {
             assertTrue(testListener.isCompleted(5000));
         }
 
-        BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
+        final BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
         sortEventsOnBundle(bundleRepair);
-        
-        DateTime changeTime = baseSubscription.getStartDate().plusDays(clockShift - 1);
 
-        PlanPhaseSpecifier spec = new PlanPhaseSpecifier(newBaseProduct, ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.TRIAL);
+        final DateTime changeTime = baseSubscription.getStartDate().plusDays(clockShift - 1);
+
+        final PlanPhaseSpecifier spec = new PlanPhaseSpecifier(newBaseProduct, ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.TRIAL);
 
-        NewEvent ne = createNewEvent(SubscriptionTransitionType.CHANGE, changeTime, spec);
-        List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
+        final NewEvent ne = createNewEvent(SubscriptionTransitionType.CHANGE, changeTime, spec);
+        final List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
         if (inTrial) {
             des.add(createDeletedEvent(bundleRepair.getSubscriptions().get(0).getExistingEvents().get(1).getEventId()));
         }
-        SubscriptionTimeline sRepair = createSubscriptionRepair(baseSubscription.getId(), des, Collections.singletonList(ne));
-        
+        final SubscriptionTimeline sRepair = createSubscriptionRepair(baseSubscription.getId(), des, Collections.singletonList(ne));
+
         // FIRST ISSUE DRY RUN
-        BundleTimeline bRepair =  createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(sRepair));
-        
+        final BundleTimeline bRepair = createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(sRepair));
+
         boolean dryRun = true;
-        BundleTimeline dryRunBundleRepair = repairApi.repairBundle(bRepair, dryRun, context);
-        
+        final BundleTimeline dryRunBundleRepair = repairApi.repairBundle(bRepair, dryRun, context);
+
         List<SubscriptionTimeline> subscriptionRepair = dryRunBundleRepair.getSubscriptions();
         assertEquals(subscriptionRepair.size(), 1);
         SubscriptionTimeline cur = subscriptionRepair.get(0);
         assertEquals(cur.getId(), baseSubscription.getId());
 
         List<ExistingEvent> events = cur.getExistingEvents();
-       assertEquals(expectedEvents.size(), events.size());
-       int index = 0;
-       for (ExistingEvent e : expectedEvents) {
-           validateExistingEventForAssertion(e, events.get(index++));           
-       }
-        SubscriptionData dryRunBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId());
-        
+        assertEquals(expectedEvents.size(), events.size());
+        int index = 0;
+        for (final ExistingEvent e : expectedEvents) {
+            validateExistingEventForAssertion(e, events.get(index++));
+        }
+        final SubscriptionData dryRunBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId());
+
         assertEquals(dryRunBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
         assertEquals(dryRunBaseSubscription.getBundleId(), bundle.getId());
         assertEquals(dryRunBaseSubscription.getStartDate(), baseSubscription.getStartDate());
@@ -558,12 +558,12 @@ public class TestRepairBP extends TestApiBaseRepair {
         } else {
             assertEquals(currentPhase.getPhaseType(), PhaseType.EVERGREEN);
         }
-        
-        
-       // SECOND RE-ISSUE CALL-- NON DRY RUN
+
+
+        // SECOND RE-ISSUE CALL-- NON DRY RUN
         dryRun = false;
         testListener.pushExpectedEvent(NextEvent.REPAIR_BUNDLE);
-        BundleTimeline realRunBundleRepair = repairApi.repairBundle(bRepair, dryRun, context);
+        final BundleTimeline realRunBundleRepair = repairApi.repairBundle(bRepair, dryRun, context);
         assertTrue(testListener.isCompleted(5000));
 
         subscriptionRepair = realRunBundleRepair.getSubscriptions();
@@ -574,13 +574,13 @@ public class TestRepairBP extends TestApiBaseRepair {
         events = cur.getExistingEvents();
         assertEquals(expectedEvents.size(), events.size());
         index = 0;
-        for (ExistingEvent e : expectedEvents) {
-           validateExistingEventForAssertion(e, events.get(index++));           
+        for (final ExistingEvent e : expectedEvents) {
+            validateExistingEventForAssertion(e, events.get(index++));
         }
-        SubscriptionData realRunBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId());
+        final SubscriptionData realRunBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId());
         assertEquals(realRunBaseSubscription.getAllTransitions().size(), expectedTransitions);
-        
-        
+
+
         assertEquals(realRunBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
         assertEquals(realRunBaseSubscription.getBundleId(), bundle.getId());
         assertEquals(realRunBaseSubscription.getStartDate(), baseSubscription.getStartDate());
@@ -600,64 +600,64 @@ public class TestRepairBP extends TestApiBaseRepair {
         }
         return baseSubscription.getId();
     }
-    
-    @Test(groups={"slow"})
+
+    @Test(groups = {"slow"})
     public void testRepairWithFurureCancelEvent() throws Exception {
-      
+
         log.info("Starting testRepairWithFurureCancelEvent");
-        
-        DateTime startDate = clock.getUTCNow();
-        
+
+        final DateTime startDate = clock.getUTCNow();
+
         // CREATE BP
         Subscription baseSubscription = createSubscription("Shotgun", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, startDate);
 
         // MOVE CLOCK -- OUT OF TRIAL
         testListener.pushExpectedEvent(NextEvent.PHASE);
-        
-        Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(35));
+
+        final Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(35));
         clock.addDeltaFromReality(it.toDurationMillis());
         assertTrue(testListener.isCompleted(5000));
-        
+
         // SET CTD to BASE SUBSCRIPTION SP CANCEL OCCURS EOT
-        DateTime newChargedThroughDate = baseSubscription.getStartDate().plusDays(30).plusMonths(1);
+        final DateTime newChargedThroughDate = baseSubscription.getStartDate().plusDays(30).plusMonths(1);
         billingApi.setChargedThroughDate(baseSubscription.getId(), newChargedThroughDate, context);
         baseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId());
 
-        
-        DateTime requestedChange = clock.getUTCNow();
+
+        final DateTime requestedChange = clock.getUTCNow();
         baseSubscription.changePlan("Pistol", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, requestedChange, context);
-        
-        
+
+
         // CHECK CHANGE DID NOT OCCUR YET
         Plan currentPlan = baseSubscription.getCurrentPlan();
         assertNotNull(currentPlan);
         assertEquals(currentPlan.getProduct().getName(), "Shotgun");
         assertEquals(currentPlan.getProduct().getCategory(), ProductCategory.BASE);
         assertEquals(currentPlan.getBillingPeriod(), BillingPeriod.MONTHLY);
-        
-        
-        DateTime repairTime = clock.getUTCNow().minusDays(1);
-        BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
+
+
+        final DateTime repairTime = clock.getUTCNow().minusDays(1);
+        final BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
         sortEventsOnBundle(bundleRepair);
-        
-        PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Assault-Rifle", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.EVERGREEN);
 
-        NewEvent ne = createNewEvent(SubscriptionTransitionType.CHANGE, repairTime, spec);
-        List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
+        final PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Assault-Rifle", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.EVERGREEN);
+
+        final NewEvent ne = createNewEvent(SubscriptionTransitionType.CHANGE, repairTime, spec);
+        final List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
         des.add(createDeletedEvent(bundleRepair.getSubscriptions().get(0).getExistingEvents().get(2).getEventId()));
 
-        SubscriptionTimeline sRepair = createSubscriptionRepair(baseSubscription.getId(), des, Collections.singletonList(ne));
-        
+        final SubscriptionTimeline sRepair = createSubscriptionRepair(baseSubscription.getId(), des, Collections.singletonList(ne));
+
         // SKIP DRY RUN AND DO REPAIR...
-        BundleTimeline bRepair =  createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(sRepair));
-        
-        boolean dryRun = false;
+        final BundleTimeline bRepair = createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(sRepair));
+
+        final boolean dryRun = false;
         testListener.pushExpectedEvent(NextEvent.REPAIR_BUNDLE);
         repairApi.repairBundle(bRepair, dryRun, context);
         assertTrue(testListener.isCompleted(5000));
-     
+
         baseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId());
-        
+
         assertEquals(((SubscriptionData) baseSubscription).getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
         assertEquals(baseSubscription.getBundleId(), bundle.getId());
         assertEquals(baseSubscription.getStartDate(), baseSubscription.getStartDate());
@@ -668,82 +668,82 @@ public class TestRepairBP extends TestApiBaseRepair {
         assertEquals(currentPlan.getProduct().getCategory(), ProductCategory.BASE);
         assertEquals(currentPlan.getBillingPeriod(), BillingPeriod.MONTHLY);
 
-        PlanPhase currentPhase = baseSubscription.getCurrentPhase();
+        final PlanPhase currentPhase = baseSubscription.getCurrentPhase();
         assertNotNull(currentPhase);
         assertEquals(currentPhase.getPhaseType(), PhaseType.EVERGREEN);
-        
+
         assertListenerStatus();
     }
-    
-    
+
+
     // Needs real SQL backend to be tested properly
-    @Test(groups={"slow"})
+    @Test(groups = {"slow"})
     public void testENT_REPAIR_VIEW_CHANGED_newEvent() throws Exception {
-       
+
         log.info("Starting testENT_REPAIR_VIEW_CHANGED_newEvent");
-        
-        TestWithException test = new TestWithException();
-        DateTime startDate = clock.getUTCNow();
-        
+
+        final TestWithException test = new TestWithException();
+        final DateTime startDate = clock.getUTCNow();
+
         final Subscription baseSubscription = createSubscription("Shotgun", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, startDate);
-        
+
         test.withException(new TestWithExceptionCallback() {
             @Override
             public void doTest() throws EntitlementRepairException, EntitlementUserApiException {
 
-                BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
+                final BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
                 sortEventsOnBundle(bundleRepair);
-                PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Assault-Rifle", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.EVERGREEN);
-                NewEvent ne = createNewEvent(SubscriptionTransitionType.CHANGE, baseSubscription.getStartDate().plusDays(10), spec);
-                List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
-                des.add(createDeletedEvent(bundleRepair.getSubscriptions().get(0).getExistingEvents().get(0).getEventId()));                
-                des.add(createDeletedEvent(bundleRepair.getSubscriptions().get(0).getExistingEvents().get(1).getEventId()));                                
-                SubscriptionTimeline sRepair = createSubscriptionRepair(baseSubscription.getId(), des, Collections.singletonList(ne));
+                final PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Assault-Rifle", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.EVERGREEN);
+                final NewEvent ne = createNewEvent(SubscriptionTransitionType.CHANGE, baseSubscription.getStartDate().plusDays(10), spec);
+                final List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
+                des.add(createDeletedEvent(bundleRepair.getSubscriptions().get(0).getExistingEvents().get(0).getEventId()));
+                des.add(createDeletedEvent(bundleRepair.getSubscriptions().get(0).getExistingEvents().get(1).getEventId()));
+                final SubscriptionTimeline sRepair = createSubscriptionRepair(baseSubscription.getId(), des, Collections.singletonList(ne));
 
-                BundleTimeline bRepair =  createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(sRepair));
+                final BundleTimeline bRepair = createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(sRepair));
 
                 testListener.pushExpectedEvent(NextEvent.CHANGE);
-                DateTime changeTime = clock.getUTCNow();
+                final DateTime changeTime = clock.getUTCNow();
                 baseSubscription.changePlan("Assault-Rifle", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, changeTime, context);
                 assertTrue(testListener.isCompleted(5000));
-                
+
                 repairApi.repairBundle(bRepair, true, context);
                 assertListenerStatus();
             }
         }, ErrorCode.ENT_REPAIR_VIEW_CHANGED);
     }
 
-    @Test(groups={"slow"}, enabled=false)
+    @Test(groups = {"slow"}, enabled = false)
     public void testENT_REPAIR_VIEW_CHANGED_ctd() throws Exception {
-       
+
         log.info("Starting testENT_REPAIR_VIEW_CHANGED_ctd");
-        
-        TestWithException test = new TestWithException();
-        DateTime startDate = clock.getUTCNow();
-        
+
+        final TestWithException test = new TestWithException();
+        final DateTime startDate = clock.getUTCNow();
+
         final Subscription baseSubscription = createSubscription("Shotgun", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, startDate);
-        
+
         test.withException(new TestWithExceptionCallback() {
             @Override
             public void doTest() throws EntitlementRepairException, EntitlementUserApiException {
 
-                BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
+                final BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
                 sortEventsOnBundle(bundleRepair);
-                PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Assault-Rifle", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.EVERGREEN);
-                NewEvent ne = createNewEvent(SubscriptionTransitionType.CHANGE, baseSubscription.getStartDate().plusDays(10), spec);
-                List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
-                des.add(createDeletedEvent(bundleRepair.getSubscriptions().get(0).getExistingEvents().get(0).getEventId()));                
-                des.add(createDeletedEvent(bundleRepair.getSubscriptions().get(0).getExistingEvents().get(1).getEventId()));                                
-                SubscriptionTimeline sRepair = createSubscriptionRepair(baseSubscription.getId(), des, Collections.singletonList(ne));
+                final PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Assault-Rifle", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.EVERGREEN);
+                final NewEvent ne = createNewEvent(SubscriptionTransitionType.CHANGE, baseSubscription.getStartDate().plusDays(10), spec);
+                final List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
+                des.add(createDeletedEvent(bundleRepair.getSubscriptions().get(0).getExistingEvents().get(0).getEventId()));
+                des.add(createDeletedEvent(bundleRepair.getSubscriptions().get(0).getExistingEvents().get(1).getEventId()));
+                final SubscriptionTimeline sRepair = createSubscriptionRepair(baseSubscription.getId(), des, Collections.singletonList(ne));
 
-                BundleTimeline bRepair =  createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(sRepair));
+                final BundleTimeline bRepair = createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(sRepair));
 
-                DateTime newChargedThroughDate = baseSubscription.getStartDate().plusDays(30).plusMonths(1);
+                final DateTime newChargedThroughDate = baseSubscription.getStartDate().plusDays(30).plusMonths(1);
                 billingApi.setChargedThroughDate(baseSubscription.getId(), newChargedThroughDate, context);
                 entitlementApi.getSubscriptionFromId(baseSubscription.getId());
 
                 repairApi.repairBundle(bRepair, true, context);
-                
+
                 assertListenerStatus();
             }
         }, ErrorCode.ENT_REPAIR_VIEW_CHANGED);

diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/api/timeline/TestRepairWithAO.java b/entitlement/src/test/java/com/ning/billing/entitlement/api/timeline/TestRepairWithAO.java
index e3156bd..85116a3 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/api/timeline/TestRepairWithAO.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/api/timeline/TestRepairWithAO.java
@@ -19,10 +19,6 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 import org.testng.annotations.Test;
@@ -47,32 +43,36 @@ import com.ning.billing.entitlement.api.user.SubscriptionData;
 import com.ning.billing.entitlement.api.user.SubscriptionEvents;
 import com.ning.billing.entitlement.glue.MockEngineModuleSql;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
 public class TestRepairWithAO extends TestApiBaseRepair {
 
     @Override
     public Injector getInjector() {
         return Guice.createInjector(Stage.DEVELOPMENT, new MockEngineModuleSql());
-    }    
+    }
 
-    @Test(groups={"slow"})
+    @Test(groups = {"slow"})
     public void testRepairChangeBPWithAddonIncluded() throws Exception {
-        
+
         log.info("Starting testRepairChangeBPWithAddonIncluded");
-        
-        String baseProduct = "Shotgun";
-        BillingPeriod baseTerm = BillingPeriod.MONTHLY;
-        String basePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
+
+        final String baseProduct = "Shotgun";
+        final BillingPeriod baseTerm = BillingPeriod.MONTHLY;
+        final String basePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
 
         // CREATE BP
-        SubscriptionData baseSubscription = createSubscription(baseProduct, baseTerm, basePriceList);
+        final SubscriptionData baseSubscription = createSubscription(baseProduct, baseTerm, basePriceList);
 
         // MOVE CLOCK A LITTLE BIT-- STILL IN TRIAL
         Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(4));
         clock.addDeltaFromReality(it.toDurationMillis());
 
-        SubscriptionData aoSubscription = createSubscription("Telescopic-Scope", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME);
-        
-        SubscriptionData aoSubscription2 = createSubscription("Laser-Scope", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME);
+        final SubscriptionData aoSubscription = createSubscription("Telescopic-Scope", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME);
+
+        final SubscriptionData aoSubscription2 = createSubscription("Laser-Scope", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME);
 
         // MOVE CLOCK A LITTLE BIT MORE -- STILL IN TRIAL
         it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(3));
@@ -80,32 +80,32 @@ public class TestRepairWithAO extends TestApiBaseRepair {
 
         BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
         sortEventsOnBundle(bundleRepair);
-        
+
         // Quick check
         SubscriptionTimeline bpRepair = getSubscriptionRepair(baseSubscription.getId(), bundleRepair);
         assertEquals(bpRepair.getExistingEvents().size(), 2);
-        
+
         SubscriptionTimeline aoRepair = getSubscriptionRepair(aoSubscription.getId(), bundleRepair);
         assertEquals(aoRepair.getExistingEvents().size(), 2);
 
         SubscriptionTimeline aoRepair2 = getSubscriptionRepair(aoSubscription2.getId(), bundleRepair);
         assertEquals(aoRepair2.getExistingEvents().size(), 2);
 
-        DateTime bpChangeDate = clock.getUTCNow().minusDays(1);
-        
-        List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
-        des.add(createDeletedEvent(bpRepair.getExistingEvents().get(1).getEventId()));        
-        
-        PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Assault-Rifle", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.TRIAL);
-        NewEvent ne = createNewEvent(SubscriptionTransitionType.CHANGE, bpChangeDate, spec);
-        
+        final DateTime bpChangeDate = clock.getUTCNow().minusDays(1);
+
+        final List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
+        des.add(createDeletedEvent(bpRepair.getExistingEvents().get(1).getEventId()));
+
+        final PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Assault-Rifle", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.TRIAL);
+        final NewEvent ne = createNewEvent(SubscriptionTransitionType.CHANGE, bpChangeDate, spec);
+
         bpRepair = createSubscriptionRepair(baseSubscription.getId(), des, Collections.singletonList(ne));
-        
-        bundleRepair =  createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(bpRepair));
-        
+
+        bundleRepair = createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(bpRepair));
+
         boolean dryRun = true;
-        BundleTimeline dryRunBundleRepair = repairApi.repairBundle(bundleRepair, dryRun, context);
-                
+        final BundleTimeline dryRunBundleRepair = repairApi.repairBundle(bundleRepair, dryRun, context);
+
         aoRepair = getSubscriptionRepair(aoSubscription.getId(), dryRunBundleRepair);
         assertEquals(aoRepair.getExistingEvents().size(), 2);
 
@@ -113,234 +113,233 @@ public class TestRepairWithAO extends TestApiBaseRepair {
         assertEquals(aoRepair.getExistingEvents().size(), 2);
 
         bpRepair = getSubscriptionRepair(baseSubscription.getId(), dryRunBundleRepair);
-        assertEquals(bpRepair.getExistingEvents().size(), 3);        
-        
+        assertEquals(bpRepair.getExistingEvents().size(), 3);
+
         // Check expected for AO
-        List<ExistingEvent> expectedAO = new LinkedList<SubscriptionTimeline.ExistingEvent>();
+        final List<ExistingEvent> expectedAO = new LinkedList<SubscriptionTimeline.ExistingEvent>();
         expectedAO.add(createExistingEventForAssertion(SubscriptionTransitionType.CREATE, "Telescopic-Scope", PhaseType.DISCOUNT,
-                ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, aoSubscription.getStartDate()));
+                                                       ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, aoSubscription.getStartDate()));
         expectedAO.add(createExistingEventForAssertion(SubscriptionTransitionType.CANCEL, "Telescopic-Scope", PhaseType.DISCOUNT,
-                ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, bpChangeDate));
+                                                       ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, bpChangeDate));
         int index = 0;
-        for (ExistingEvent e : expectedAO) {
-           validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));           
+        for (final ExistingEvent e : expectedAO) {
+            validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));
         }
 
-        List<ExistingEvent> expectedAO2 = new LinkedList<SubscriptionTimeline.ExistingEvent>();
+        final List<ExistingEvent> expectedAO2 = new LinkedList<SubscriptionTimeline.ExistingEvent>();
         expectedAO2.add(createExistingEventForAssertion(SubscriptionTransitionType.CREATE, "Laser-Scope", PhaseType.DISCOUNT,
-                ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, aoSubscription2.getStartDate()));
+                                                        ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, aoSubscription2.getStartDate()));
         expectedAO2.add(createExistingEventForAssertion(SubscriptionTransitionType.PHASE, "Laser-Scope", PhaseType.EVERGREEN,
-                ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, aoSubscription2.getStartDate().plusMonths(1)));
+                                                        ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, aoSubscription2.getStartDate().plusMonths(1)));
         index = 0;
-        for (ExistingEvent e : expectedAO2) {
-           validateExistingEventForAssertion(e, aoRepair2.getExistingEvents().get(index++));           
+        for (final ExistingEvent e : expectedAO2) {
+            validateExistingEventForAssertion(e, aoRepair2.getExistingEvents().get(index++));
         }
-        
+
         // Check expected for BP        
-        List<ExistingEvent> expectedBP = new LinkedList<SubscriptionTimeline.ExistingEvent>();
+        final List<ExistingEvent> expectedBP = new LinkedList<SubscriptionTimeline.ExistingEvent>();
         expectedBP.add(createExistingEventForAssertion(SubscriptionTransitionType.CREATE, "Shotgun", PhaseType.TRIAL,
-                ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.NO_BILLING_PERIOD, baseSubscription.getStartDate()));
+                                                       ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.NO_BILLING_PERIOD, baseSubscription.getStartDate()));
         expectedBP.add(createExistingEventForAssertion(SubscriptionTransitionType.CHANGE, "Assault-Rifle", PhaseType.TRIAL,
-                ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.NO_BILLING_PERIOD, bpChangeDate));
+                                                       ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.NO_BILLING_PERIOD, bpChangeDate));
         expectedBP.add(createExistingEventForAssertion(SubscriptionTransitionType.PHASE, "Assault-Rifle", PhaseType.EVERGREEN,
-                ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, baseSubscription.getStartDate().plusDays(30)));
+                                                       ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, baseSubscription.getStartDate().plusDays(30)));
         index = 0;
-        for (ExistingEvent e : expectedBP) {
-           validateExistingEventForAssertion(e, bpRepair.getExistingEvents().get(index++));           
+        for (final ExistingEvent e : expectedBP) {
+            validateExistingEventForAssertion(e, bpRepair.getExistingEvents().get(index++));
         }
 
-        
-        SubscriptionData newAoSubscription = (SubscriptionData)  entitlementApi.getSubscriptionFromId(aoSubscription.getId());
+
+        SubscriptionData newAoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId());
         assertEquals(newAoSubscription.getState(), SubscriptionState.ACTIVE);
         assertEquals(newAoSubscription.getAllTransitions().size(), 2);
         assertEquals(newAoSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
 
-        SubscriptionData newAoSubscription2 = (SubscriptionData)  entitlementApi.getSubscriptionFromId(aoSubscription2.getId());
+        SubscriptionData newAoSubscription2 = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription2.getId());
         assertEquals(newAoSubscription2.getState(), SubscriptionState.ACTIVE);
         assertEquals(newAoSubscription2.getAllTransitions().size(), 2);
         assertEquals(newAoSubscription2.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
 
-        
-        SubscriptionData newBaseSubscription = (SubscriptionData)  entitlementApi.getSubscriptionFromId(baseSubscription.getId());
+
+        SubscriptionData newBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId());
         assertEquals(newBaseSubscription.getState(), SubscriptionState.ACTIVE);
         assertEquals(newBaseSubscription.getAllTransitions().size(), 2);
         assertEquals(newBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
-        
-        dryRun = false;        
+
+        dryRun = false;
         testListener.pushExpectedEvent(NextEvent.REPAIR_BUNDLE);
-        BundleTimeline realRunBundleRepair = repairApi.repairBundle(bundleRepair, dryRun, context);
+        final BundleTimeline realRunBundleRepair = repairApi.repairBundle(bundleRepair, dryRun, context);
         assertTrue(testListener.isCompleted(5000));
 
-        
-        
+
         aoRepair = getSubscriptionRepair(aoSubscription.getId(), realRunBundleRepair);
         assertEquals(aoRepair.getExistingEvents().size(), 2);
 
         bpRepair = getSubscriptionRepair(baseSubscription.getId(), realRunBundleRepair);
-        assertEquals(bpRepair.getExistingEvents().size(), 3);        
-        
+        assertEquals(bpRepair.getExistingEvents().size(), 3);
+
         index = 0;
-        for (ExistingEvent e : expectedAO) {
-           validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));           
+        for (final ExistingEvent e : expectedAO) {
+            validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));
         }
-        
+
         index = 0;
-        for (ExistingEvent e : expectedAO2) {
-           validateExistingEventForAssertion(e, aoRepair2.getExistingEvents().get(index++));           
+        for (final ExistingEvent e : expectedAO2) {
+            validateExistingEventForAssertion(e, aoRepair2.getExistingEvents().get(index++));
         }
 
         index = 0;
-        for (ExistingEvent e : expectedBP) {
-           validateExistingEventForAssertion(e, bpRepair.getExistingEvents().get(index++));           
+        for (final ExistingEvent e : expectedBP) {
+            validateExistingEventForAssertion(e, bpRepair.getExistingEvents().get(index++));
         }
 
-        newAoSubscription = (SubscriptionData)  entitlementApi.getSubscriptionFromId(aoSubscription.getId());
+        newAoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId());
         assertEquals(newAoSubscription.getState(), SubscriptionState.CANCELLED);
         assertEquals(newAoSubscription.getAllTransitions().size(), 2);
         assertEquals(newAoSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
-            
-        newAoSubscription2 = (SubscriptionData)  entitlementApi.getSubscriptionFromId(aoSubscription2.getId());
+
+        newAoSubscription2 = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription2.getId());
         assertEquals(newAoSubscription2.getState(), SubscriptionState.ACTIVE);
         assertEquals(newAoSubscription2.getAllTransitions().size(), 2);
         assertEquals(newAoSubscription2.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
 
-        
-        newBaseSubscription = (SubscriptionData)  entitlementApi.getSubscriptionFromId(baseSubscription.getId());
+
+        newBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId());
         assertEquals(newBaseSubscription.getState(), SubscriptionState.ACTIVE);
         assertEquals(newBaseSubscription.getAllTransitions().size(), 3);
         assertEquals(newBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
     }
 
-    @Test(groups={"slow"})
+    @Test(groups = {"slow"})
     public void testRepairChangeBPWithAddonNonAvailable() throws Exception {
-        
+
         log.info("Starting testRepairChangeBPWithAddonNonAvailable");
-        
-        String baseProduct = "Shotgun";
-        BillingPeriod baseTerm = BillingPeriod.MONTHLY;
-        String basePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
+
+        final String baseProduct = "Shotgun";
+        final BillingPeriod baseTerm = BillingPeriod.MONTHLY;
+        final String basePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
 
         // CREATE BP
-        SubscriptionData baseSubscription = createSubscription(baseProduct, baseTerm, basePriceList);
+        final SubscriptionData baseSubscription = createSubscription(baseProduct, baseTerm, basePriceList);
 
         // MOVE CLOCK A LITTLE BIT-- STILL IN TRIAL
         Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(3));
         clock.addDeltaFromReality(it.toDurationMillis());
 
-        SubscriptionData aoSubscription = createSubscription("Telescopic-Scope", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME);
-        
+        final SubscriptionData aoSubscription = createSubscription("Telescopic-Scope", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME);
+
         // MOVE CLOCK A LITTLE BIT MORE -- AFTER TRIAL
         testListener.pushExpectedEvent(NextEvent.PHASE);
         testListener.pushExpectedEvent(NextEvent.PHASE);
-        
+
         it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(32));
         clock.addDeltaFromReality(it.toDurationMillis());
-        assertTrue(testListener.isCompleted(7000));        
+        assertTrue(testListener.isCompleted(7000));
 
         BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
         sortEventsOnBundle(bundleRepair);
-        
+
         // Quick check
         SubscriptionTimeline bpRepair = getSubscriptionRepair(baseSubscription.getId(), bundleRepair);
         assertEquals(bpRepair.getExistingEvents().size(), 2);
-        
+
         SubscriptionTimeline aoRepair = getSubscriptionRepair(aoSubscription.getId(), bundleRepair);
         assertEquals(aoRepair.getExistingEvents().size(), 2);
 
-        DateTime bpChangeDate = clock.getUTCNow().minusDays(1);
-        
-        PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Pistol", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.EVERGREEN);
-        NewEvent ne = createNewEvent(SubscriptionTransitionType.CHANGE, bpChangeDate, spec);
-        
+        final DateTime bpChangeDate = clock.getUTCNow().minusDays(1);
+
+        final PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Pistol", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.EVERGREEN);
+        final NewEvent ne = createNewEvent(SubscriptionTransitionType.CHANGE, bpChangeDate, spec);
+
         bpRepair = createSubscriptionRepair(baseSubscription.getId(), Collections.<SubscriptionTimeline.DeletedEvent>emptyList(), Collections.singletonList(ne));
-        
-        bundleRepair =  createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(bpRepair));
-        
+
+        bundleRepair = createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(bpRepair));
+
         boolean dryRun = true;
-        BundleTimeline dryRunBundleRepair = repairApi.repairBundle(bundleRepair, dryRun, context);
-                
+        final BundleTimeline dryRunBundleRepair = repairApi.repairBundle(bundleRepair, dryRun, context);
+
         aoRepair = getSubscriptionRepair(aoSubscription.getId(), dryRunBundleRepair);
         assertEquals(aoRepair.getExistingEvents().size(), 3);
 
         bpRepair = getSubscriptionRepair(baseSubscription.getId(), dryRunBundleRepair);
-        assertEquals(bpRepair.getExistingEvents().size(), 3);        
-        
+        assertEquals(bpRepair.getExistingEvents().size(), 3);
+
         // Check expected for AO
-        List<ExistingEvent> expectedAO = new LinkedList<SubscriptionTimeline.ExistingEvent>();
+        final List<ExistingEvent> expectedAO = new LinkedList<SubscriptionTimeline.ExistingEvent>();
         expectedAO.add(createExistingEventForAssertion(SubscriptionTransitionType.CREATE, "Telescopic-Scope", PhaseType.DISCOUNT,
-                ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, aoSubscription.getStartDate()));
+                                                       ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, aoSubscription.getStartDate()));
         expectedAO.add(createExistingEventForAssertion(SubscriptionTransitionType.CREATE, "Telescopic-Scope", PhaseType.EVERGREEN,
-                ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, baseSubscription.getStartDate().plusMonths(1)));
+                                                       ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, baseSubscription.getStartDate().plusMonths(1)));
         expectedAO.add(createExistingEventForAssertion(SubscriptionTransitionType.CANCEL, "Telescopic-Scope", PhaseType.EVERGREEN,
-                ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, bpChangeDate));
+                                                       ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, bpChangeDate));
         int index = 0;
-        for (ExistingEvent e : expectedAO) {
-           validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));           
+        for (final ExistingEvent e : expectedAO) {
+            validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));
         }
 
         // Check expected for BP        
-        List<ExistingEvent> expectedBP = new LinkedList<SubscriptionTimeline.ExistingEvent>();
+        final List<ExistingEvent> expectedBP = new LinkedList<SubscriptionTimeline.ExistingEvent>();
         expectedBP.add(createExistingEventForAssertion(SubscriptionTransitionType.CREATE, "Shotgun", PhaseType.TRIAL,
-                ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.NO_BILLING_PERIOD, baseSubscription.getStartDate()));
+                                                       ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.NO_BILLING_PERIOD, baseSubscription.getStartDate()));
         expectedBP.add(createExistingEventForAssertion(SubscriptionTransitionType.PHASE, "Shotgun", PhaseType.EVERGREEN,
-                ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, baseSubscription.getStartDate().plusDays(30)));
+                                                       ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, baseSubscription.getStartDate().plusDays(30)));
         expectedBP.add(createExistingEventForAssertion(SubscriptionTransitionType.CHANGE, "Pistol", PhaseType.EVERGREEN,
-                ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, bpChangeDate));
+                                                       ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, bpChangeDate));
         index = 0;
-        for (ExistingEvent e : expectedBP) {
-           validateExistingEventForAssertion(e, bpRepair.getExistingEvents().get(index++));           
+        for (final ExistingEvent e : expectedBP) {
+            validateExistingEventForAssertion(e, bpRepair.getExistingEvents().get(index++));
         }
-        
-        SubscriptionData newAoSubscription = (SubscriptionData)  entitlementApi.getSubscriptionFromId(aoSubscription.getId());
+
+        SubscriptionData newAoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId());
         assertEquals(newAoSubscription.getState(), SubscriptionState.ACTIVE);
         assertEquals(newAoSubscription.getAllTransitions().size(), 2);
         assertEquals(newAoSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
 
-        SubscriptionData newBaseSubscription = (SubscriptionData)  entitlementApi.getSubscriptionFromId(baseSubscription.getId());
+        SubscriptionData newBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId());
         assertEquals(newBaseSubscription.getState(), SubscriptionState.ACTIVE);
         assertEquals(newBaseSubscription.getAllTransitions().size(), 2);
         assertEquals(newBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
-        
+
         dryRun = false;
         testListener.pushExpectedEvent(NextEvent.REPAIR_BUNDLE);
-        BundleTimeline realRunBundleRepair = repairApi.repairBundle(bundleRepair, dryRun, context);
+        final BundleTimeline realRunBundleRepair = repairApi.repairBundle(bundleRepair, dryRun, context);
         assertTrue(testListener.isCompleted(5000));
 
         aoRepair = getSubscriptionRepair(aoSubscription.getId(), realRunBundleRepair);
         assertEquals(aoRepair.getExistingEvents().size(), 3);
 
         bpRepair = getSubscriptionRepair(baseSubscription.getId(), realRunBundleRepair);
-        assertEquals(bpRepair.getExistingEvents().size(), 3);        
-        
+        assertEquals(bpRepair.getExistingEvents().size(), 3);
+
         index = 0;
-        for (ExistingEvent e : expectedAO) {
-           validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));           
+        for (final ExistingEvent e : expectedAO) {
+            validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));
         }
-        
+
         index = 0;
-        for (ExistingEvent e : expectedBP) {
-           validateExistingEventForAssertion(e, bpRepair.getExistingEvents().get(index++));           
+        for (final ExistingEvent e : expectedBP) {
+            validateExistingEventForAssertion(e, bpRepair.getExistingEvents().get(index++));
         }
 
-        newAoSubscription = (SubscriptionData)  entitlementApi.getSubscriptionFromId(aoSubscription.getId());
+        newAoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId());
         assertEquals(newAoSubscription.getState(), SubscriptionState.CANCELLED);
         assertEquals(newAoSubscription.getAllTransitions().size(), 3);
         assertEquals(newAoSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
-            
-        newBaseSubscription = (SubscriptionData)  entitlementApi.getSubscriptionFromId(baseSubscription.getId());
+
+        newBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId());
         assertEquals(newBaseSubscription.getState(), SubscriptionState.ACTIVE);
         assertEquals(newBaseSubscription.getAllTransitions().size(), 3);
         assertEquals(newBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
     }
 
-    @Test(groups={"slow"})
+    @Test(groups = {"slow"})
     public void testRepairCancelBP_EOT_WithAddons() throws Exception {
-        
+
         log.info("Starting testRepairCancelBP_EOT_WithAddons");
-        
-        String baseProduct = "Shotgun";
-        BillingPeriod baseTerm = BillingPeriod.MONTHLY;
-        String basePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
+
+        final String baseProduct = "Shotgun";
+        final BillingPeriod baseTerm = BillingPeriod.MONTHLY;
+        final String basePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
 
         // CREATE BP
         SubscriptionData baseSubscription = createSubscription(baseProduct, baseTerm, basePriceList);
@@ -350,318 +349,317 @@ public class TestRepairWithAO extends TestApiBaseRepair {
         clock.addDeltaFromReality(it.toDurationMillis());
 
 
-        SubscriptionData aoSubscription = createSubscription("Telescopic-Scope", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME);
-        
+        final SubscriptionData aoSubscription = createSubscription("Telescopic-Scope", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME);
+
         // MOVE CLOCK A LITTLE BIT MORE -- AFTER TRIAL
         testListener.pushExpectedEvent(NextEvent.PHASE);
         testListener.pushExpectedEvent(NextEvent.PHASE);
-        
+
         it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(40));
         clock.addDeltaFromReality(it.toDurationMillis());
         assertTrue(testListener.isCompleted(7000));
-        
+
         // SET CTD to BASE SUBSCRIPTION SP CANCEL OCCURS EOT
-        DateTime newChargedThroughDate = baseSubscription.getStartDate().plusDays(30).plusMonths(1);
+        final DateTime newChargedThroughDate = baseSubscription.getStartDate().plusDays(30).plusMonths(1);
         billingApi.setChargedThroughDate(baseSubscription.getId(), newChargedThroughDate, context);
         baseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId());
 
         BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
         sortEventsOnBundle(bundleRepair);
-        
+
         // Quick check
         SubscriptionTimeline bpRepair = getSubscriptionRepair(baseSubscription.getId(), bundleRepair);
         assertEquals(bpRepair.getExistingEvents().size(), 2);
-        
+
         SubscriptionTimeline aoRepair = getSubscriptionRepair(aoSubscription.getId(), bundleRepair);
         assertEquals(aoRepair.getExistingEvents().size(), 2);
 
-        DateTime bpCancelDate = clock.getUTCNow().minusDays(1);
-        NewEvent ne = createNewEvent(SubscriptionTransitionType.CANCEL, bpCancelDate, null);
+        final DateTime bpCancelDate = clock.getUTCNow().minusDays(1);
+        final NewEvent ne = createNewEvent(SubscriptionTransitionType.CANCEL, bpCancelDate, null);
         bpRepair = createSubscriptionRepair(baseSubscription.getId(), Collections.<SubscriptionTimeline.DeletedEvent>emptyList(), Collections.singletonList(ne));
-        bundleRepair =  createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(bpRepair));
-        
+        bundleRepair = createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(bpRepair));
+
         boolean dryRun = true;
-        BundleTimeline dryRunBundleRepair = repairApi.repairBundle(bundleRepair, dryRun, context);
-                
+        final BundleTimeline dryRunBundleRepair = repairApi.repairBundle(bundleRepair, dryRun, context);
+
         aoRepair = getSubscriptionRepair(aoSubscription.getId(), dryRunBundleRepair);
         assertEquals(aoRepair.getExistingEvents().size(), 3);
 
         bpRepair = getSubscriptionRepair(baseSubscription.getId(), dryRunBundleRepair);
-        assertEquals(bpRepair.getExistingEvents().size(), 3);        
-        
+        assertEquals(bpRepair.getExistingEvents().size(), 3);
+
         // Check expected for AO
-        List<ExistingEvent> expectedAO = new LinkedList<SubscriptionTimeline.ExistingEvent>();
+        final List<ExistingEvent> expectedAO = new LinkedList<SubscriptionTimeline.ExistingEvent>();
         expectedAO.add(createExistingEventForAssertion(SubscriptionTransitionType.CREATE, "Telescopic-Scope", PhaseType.DISCOUNT,
-                ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, aoSubscription.getStartDate()));
+                                                       ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, aoSubscription.getStartDate()));
         expectedAO.add(createExistingEventForAssertion(SubscriptionTransitionType.PHASE, "Telescopic-Scope", PhaseType.EVERGREEN,
-                ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, baseSubscription.getStartDate().plusMonths(1)));
+                                                       ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, baseSubscription.getStartDate().plusMonths(1)));
         expectedAO.add(createExistingEventForAssertion(SubscriptionTransitionType.CANCEL, "Telescopic-Scope", PhaseType.EVERGREEN,
-                ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, newChargedThroughDate));
+                                                       ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, newChargedThroughDate));
 
         int index = 0;
-        for (ExistingEvent e : expectedAO) {
-           validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));           
+        for (final ExistingEvent e : expectedAO) {
+            validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));
         }
 
         // Check expected for BP        
-        List<ExistingEvent> expectedBP = new LinkedList<SubscriptionTimeline.ExistingEvent>();
+        final List<ExistingEvent> expectedBP = new LinkedList<SubscriptionTimeline.ExistingEvent>();
         expectedBP.add(createExistingEventForAssertion(SubscriptionTransitionType.CREATE, "Shotgun", PhaseType.TRIAL,
-                ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.NO_BILLING_PERIOD, baseSubscription.getStartDate()));
+                                                       ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.NO_BILLING_PERIOD, baseSubscription.getStartDate()));
         expectedBP.add(createExistingEventForAssertion(SubscriptionTransitionType.PHASE, "Shotgun", PhaseType.EVERGREEN,
-                ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, baseSubscription.getStartDate().plusDays(30)));
+                                                       ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, baseSubscription.getStartDate().plusDays(30)));
         expectedBP.add(createExistingEventForAssertion(SubscriptionTransitionType.CANCEL, "Shotgun", PhaseType.EVERGREEN,
-                ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, newChargedThroughDate));
+                                                       ProductCategory.BASE, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, newChargedThroughDate));
         index = 0;
-        for (ExistingEvent e : expectedBP) {
-           validateExistingEventForAssertion(e, bpRepair.getExistingEvents().get(index++));           
+        for (final ExistingEvent e : expectedBP) {
+            validateExistingEventForAssertion(e, bpRepair.getExistingEvents().get(index++));
         }
-        
-        SubscriptionData newAoSubscription = (SubscriptionData)  entitlementApi.getSubscriptionFromId(aoSubscription.getId());
+
+        SubscriptionData newAoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId());
         assertEquals(newAoSubscription.getState(), SubscriptionState.ACTIVE);
         assertEquals(newAoSubscription.getAllTransitions().size(), 2);
         assertEquals(newAoSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
 
-        SubscriptionData newBaseSubscription = (SubscriptionData)  entitlementApi.getSubscriptionFromId(baseSubscription.getId());
+        SubscriptionData newBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId());
         assertEquals(newBaseSubscription.getState(), SubscriptionState.ACTIVE);
         assertEquals(newBaseSubscription.getAllTransitions().size(), 2);
         assertEquals(newBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
-        
+
         dryRun = false;
         testListener.pushExpectedEvent(NextEvent.REPAIR_BUNDLE);
-        BundleTimeline realRunBundleRepair = repairApi.repairBundle(bundleRepair, dryRun, context);
+        final BundleTimeline realRunBundleRepair = repairApi.repairBundle(bundleRepair, dryRun, context);
         assertTrue(testListener.isCompleted(5000));
-        
+
         aoRepair = getSubscriptionRepair(aoSubscription.getId(), realRunBundleRepair);
         assertEquals(aoRepair.getExistingEvents().size(), 3);
 
         bpRepair = getSubscriptionRepair(baseSubscription.getId(), realRunBundleRepair);
-        assertEquals(bpRepair.getExistingEvents().size(), 3);        
-        
+        assertEquals(bpRepair.getExistingEvents().size(), 3);
+
         index = 0;
-        for (ExistingEvent e : expectedAO) {
-           validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));           
+        for (final ExistingEvent e : expectedAO) {
+            validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));
         }
-        
+
         index = 0;
-        for (ExistingEvent e : expectedBP) {
-           validateExistingEventForAssertion(e, bpRepair.getExistingEvents().get(index++));           
+        for (final ExistingEvent e : expectedBP) {
+            validateExistingEventForAssertion(e, bpRepair.getExistingEvents().get(index++));
         }
 
-        newAoSubscription = (SubscriptionData)  entitlementApi.getSubscriptionFromId(aoSubscription.getId());
+        newAoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId());
         assertEquals(newAoSubscription.getState(), SubscriptionState.ACTIVE);
         assertEquals(newAoSubscription.getAllTransitions().size(), 3);
         assertEquals(newAoSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
-            
-        newBaseSubscription = (SubscriptionData)  entitlementApi.getSubscriptionFromId(baseSubscription.getId());
+
+        newBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId());
         assertEquals(newBaseSubscription.getState(), SubscriptionState.ACTIVE);
         assertEquals(newBaseSubscription.getAllTransitions().size(), 3);
         assertEquals(newBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
-        
+
         // MOVE CLOCK AFTER CANCEL DATE
         testListener.pushExpectedEvent(NextEvent.CANCEL);
         testListener.pushExpectedEvent(NextEvent.CANCEL);
-        
+
         it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(32));
         clock.addDeltaFromReality(it.toDurationMillis());
         assertTrue(testListener.isCompleted(7000));
 
-        newAoSubscription = (SubscriptionData)  entitlementApi.getSubscriptionFromId(aoSubscription.getId());
+        newAoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId());
         assertEquals(newAoSubscription.getState(), SubscriptionState.CANCELLED);
         assertEquals(newAoSubscription.getAllTransitions().size(), 3);
         assertEquals(newAoSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
-            
-        newBaseSubscription = (SubscriptionData)  entitlementApi.getSubscriptionFromId(baseSubscription.getId());
+
+        newBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId());
         assertEquals(newBaseSubscription.getState(), SubscriptionState.CANCELLED);
         assertEquals(newBaseSubscription.getAllTransitions().size(), 3);
         assertEquals(newBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
     }
 
-    
-    
-    @Test(groups={"slow"})
+
+    @Test(groups = {"slow"})
     public void testRepairCancelAO() throws Exception {
-        
+
         log.info("Starting testRepairCancelAO");
-        
-        String baseProduct = "Shotgun";
-        BillingPeriod baseTerm = BillingPeriod.MONTHLY;
-        String basePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
+
+        final String baseProduct = "Shotgun";
+        final BillingPeriod baseTerm = BillingPeriod.MONTHLY;
+        final String basePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
 
         // CREATE BP
-        SubscriptionData baseSubscription = createSubscription(baseProduct, baseTerm, basePriceList);
+        final SubscriptionData baseSubscription = createSubscription(baseProduct, baseTerm, basePriceList);
 
         // MOVE CLOCK A LITTLE BIT-- STILL IN TRIAL
         Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(4));
         clock.addDeltaFromReality(it.toDurationMillis());
 
-        SubscriptionData aoSubscription = createSubscription("Telescopic-Scope", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME);
+        final SubscriptionData aoSubscription = createSubscription("Telescopic-Scope", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME);
 
         // MOVE CLOCK A LITTLE BIT MORE -- STILL IN TRIAL
         it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(3));
         clock.addDeltaFromReality(it.toDurationMillis());
 
-        BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
+        final BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
         sortEventsOnBundle(bundleRepair);
-        
+
         // Quick check
         SubscriptionTimeline bpRepair = getSubscriptionRepair(baseSubscription.getId(), bundleRepair);
         assertEquals(bpRepair.getExistingEvents().size(), 2);
-        
+
         SubscriptionTimeline aoRepair = getSubscriptionRepair(aoSubscription.getId(), bundleRepair);
         assertEquals(aoRepair.getExistingEvents().size(), 2);
-        
-
-        List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
-        des.add(createDeletedEvent(aoRepair.getExistingEvents().get(1).getEventId()));        
-        DateTime aoCancelDate = aoSubscription.getStartDate().plusDays(1);
-        
-        NewEvent ne = createNewEvent(SubscriptionTransitionType.CANCEL, aoCancelDate, null);
-        
-        SubscriptionTimeline saoRepair = createSubscriptionRepair(aoSubscription.getId(), des, Collections.singletonList(ne));
-        
-        BundleTimeline bRepair =  createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(saoRepair));
-        
+
+
+        final List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
+        des.add(createDeletedEvent(aoRepair.getExistingEvents().get(1).getEventId()));
+        final DateTime aoCancelDate = aoSubscription.getStartDate().plusDays(1);
+
+        final NewEvent ne = createNewEvent(SubscriptionTransitionType.CANCEL, aoCancelDate, null);
+
+        final SubscriptionTimeline saoRepair = createSubscriptionRepair(aoSubscription.getId(), des, Collections.singletonList(ne));
+
+        final BundleTimeline bRepair = createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(saoRepair));
+
         boolean dryRun = true;
-        BundleTimeline dryRunBundleRepair = repairApi.repairBundle(bRepair, dryRun, context);
-        
+        final BundleTimeline dryRunBundleRepair = repairApi.repairBundle(bRepair, dryRun, context);
+
         aoRepair = getSubscriptionRepair(aoSubscription.getId(), dryRunBundleRepair);
         assertEquals(aoRepair.getExistingEvents().size(), 2);
-        
+
         bpRepair = getSubscriptionRepair(baseSubscription.getId(), bundleRepair);
-        assertEquals(bpRepair.getExistingEvents().size(), 2);        
-        
-        List<ExistingEvent> expected = new LinkedList<SubscriptionTimeline.ExistingEvent>();
+        assertEquals(bpRepair.getExistingEvents().size(), 2);
+
+        final List<ExistingEvent> expected = new LinkedList<SubscriptionTimeline.ExistingEvent>();
         expected.add(createExistingEventForAssertion(SubscriptionTransitionType.CREATE, "Telescopic-Scope", PhaseType.DISCOUNT,
-                ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, aoSubscription.getStartDate()));
+                                                     ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, aoSubscription.getStartDate()));
         expected.add(createExistingEventForAssertion(SubscriptionTransitionType.CANCEL, "Telescopic-Scope", PhaseType.DISCOUNT,
-                ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, aoCancelDate));
+                                                     ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, aoCancelDate));
         int index = 0;
-        for (ExistingEvent e : expected) {
-           validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));           
+        for (final ExistingEvent e : expected) {
+            validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));
         }
-        SubscriptionData newAoSubscription = (SubscriptionData)  entitlementApi.getSubscriptionFromId(aoSubscription.getId());
+        SubscriptionData newAoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId());
         assertEquals(newAoSubscription.getState(), SubscriptionState.ACTIVE);
         assertEquals(newAoSubscription.getAllTransitions().size(), 2);
         assertEquals(newAoSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
-                
-        SubscriptionData newBaseSubscription = (SubscriptionData)  entitlementApi.getSubscriptionFromId(baseSubscription.getId());
+
+        SubscriptionData newBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId());
         assertEquals(newBaseSubscription.getState(), SubscriptionState.ACTIVE);
         assertEquals(newBaseSubscription.getAllTransitions().size(), 2);
         assertEquals(newBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
-        
+
         dryRun = false;
         testListener.pushExpectedEvent(NextEvent.REPAIR_BUNDLE);
-        BundleTimeline realRunBundleRepair = repairApi.repairBundle(bRepair, dryRun, context);
+        final BundleTimeline realRunBundleRepair = repairApi.repairBundle(bRepair, dryRun, context);
         assertTrue(testListener.isCompleted(5000));
 
-        
+
         aoRepair = getSubscriptionRepair(aoSubscription.getId(), realRunBundleRepair);
         assertEquals(aoRepair.getExistingEvents().size(), 2);
         index = 0;
-        for (ExistingEvent e : expected) {
-           validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));           
+        for (final ExistingEvent e : expected) {
+            validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));
         }
-        
-        newAoSubscription = (SubscriptionData)  entitlementApi.getSubscriptionFromId(aoSubscription.getId());
+
+        newAoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId());
         assertEquals(newAoSubscription.getState(), SubscriptionState.CANCELLED);
         assertEquals(newAoSubscription.getAllTransitions().size(), 2);
-        assertEquals(newAoSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);        
-                
-        newBaseSubscription = (SubscriptionData)  entitlementApi.getSubscriptionFromId(baseSubscription.getId());
+        assertEquals(newAoSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
+
+        newBaseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId());
         assertEquals(newBaseSubscription.getState(), SubscriptionState.ACTIVE);
         assertEquals(newBaseSubscription.getAllTransitions().size(), 2);
         assertEquals(newBaseSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
     }
-    
-    
-    @Test(groups={"slow"})
+
+
+    @Test(groups = {"slow"})
     public void testRepairRecreateAO() throws Exception {
-        
+
         log.info("Starting testRepairRecreateAO");
-        
-        String baseProduct = "Shotgun";
-        BillingPeriod baseTerm = BillingPeriod.MONTHLY;
-        String basePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
+
+        final String baseProduct = "Shotgun";
+        final BillingPeriod baseTerm = BillingPeriod.MONTHLY;
+        final String basePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
 
         // CREATE BP
-        SubscriptionData baseSubscription = createSubscription(baseProduct, baseTerm, basePriceList);
+        final SubscriptionData baseSubscription = createSubscription(baseProduct, baseTerm, basePriceList);
 
         // MOVE CLOCK A LITTLE BIT-- STILL IN TRIAL
         Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(4));
         clock.addDeltaFromReality(it.toDurationMillis());
 
-        SubscriptionData aoSubscription = createSubscription("Telescopic-Scope", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME);
+        final SubscriptionData aoSubscription = createSubscription("Telescopic-Scope", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME);
 
         // MOVE CLOCK A LITTLE BIT MORE -- STILL IN TRIAL
         it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(3));
         clock.addDeltaFromReality(it.toDurationMillis());
 
-        BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
+        final BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
         sortEventsOnBundle(bundleRepair);
-        
+
         // Quick check
-        SubscriptionTimeline bpRepair = getSubscriptionRepair(baseSubscription.getId(), bundleRepair);
+        final SubscriptionTimeline bpRepair = getSubscriptionRepair(baseSubscription.getId(), bundleRepair);
         assertEquals(bpRepair.getExistingEvents().size(), 2);
-        
+
         SubscriptionTimeline aoRepair = getSubscriptionRepair(aoSubscription.getId(), bundleRepair);
         assertEquals(aoRepair.getExistingEvents().size(), 2);
-        
 
-        List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
-        des.add(createDeletedEvent(aoRepair.getExistingEvents().get(0).getEventId()));        
+
+        final List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
+        des.add(createDeletedEvent(aoRepair.getExistingEvents().get(0).getEventId()));
         des.add(createDeletedEvent(aoRepair.getExistingEvents().get(1).getEventId()));
 
-        DateTime aoRecreateDate = aoSubscription.getStartDate().plusDays(1);
-        PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Telescopic-Scope", ProductCategory.ADD_ON, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.DISCOUNT);
-        NewEvent ne = createNewEvent(SubscriptionTransitionType.CREATE, aoRecreateDate, spec);
-        
-        SubscriptionTimeline saoRepair = createSubscriptionRepair(aoSubscription.getId(), des, Collections.singletonList(ne));
-        
-        BundleTimeline bRepair =  createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(saoRepair));
-        
+        final DateTime aoRecreateDate = aoSubscription.getStartDate().plusDays(1);
+        final PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Telescopic-Scope", ProductCategory.ADD_ON, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.DISCOUNT);
+        final NewEvent ne = createNewEvent(SubscriptionTransitionType.CREATE, aoRecreateDate, spec);
+
+        final SubscriptionTimeline saoRepair = createSubscriptionRepair(aoSubscription.getId(), des, Collections.singletonList(ne));
+
+        final BundleTimeline bRepair = createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(saoRepair));
+
         boolean dryRun = true;
-        BundleTimeline dryRunBundleRepair = repairApi.repairBundle(bRepair, dryRun, context);
-        
+        final BundleTimeline dryRunBundleRepair = repairApi.repairBundle(bRepair, dryRun, context);
+
         aoRepair = getSubscriptionRepair(aoSubscription.getId(), dryRunBundleRepair);
         assertEquals(aoRepair.getExistingEvents().size(), 2);
-        
-        
-        List<ExistingEvent> expected = new LinkedList<SubscriptionTimeline.ExistingEvent>();
+
+
+        final List<ExistingEvent> expected = new LinkedList<SubscriptionTimeline.ExistingEvent>();
         expected.add(createExistingEventForAssertion(SubscriptionTransitionType.CREATE, "Telescopic-Scope", PhaseType.DISCOUNT,
-                ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, aoRecreateDate));
+                                                     ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, aoRecreateDate));
         expected.add(createExistingEventForAssertion(SubscriptionTransitionType.PHASE, "Telescopic-Scope", PhaseType.EVERGREEN,
-                    ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, baseSubscription.getStartDate().plusMonths(1) /* Bundle align */));
+                                                     ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, baseSubscription.getStartDate().plusMonths(1) /* Bundle align */));
         int index = 0;
-        for (ExistingEvent e : expected) {
-           validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));           
+        for (final ExistingEvent e : expected) {
+            validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));
         }
-        SubscriptionData newAoSubscription = (SubscriptionData)  entitlementApi.getSubscriptionFromId(aoSubscription.getId());
+        SubscriptionData newAoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId());
         assertEquals(newAoSubscription.getState(), SubscriptionState.ACTIVE);
         assertEquals(newAoSubscription.getAllTransitions().size(), 2);
         assertEquals(newAoSubscription.getStartDate(), aoSubscription.getStartDate());
-        assertEquals(newAoSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);        
-        
+        assertEquals(newAoSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
+
         // NOW COMMIT
         dryRun = false;
         testListener.pushExpectedEvent(NextEvent.REPAIR_BUNDLE);
-        BundleTimeline realRunBundleRepair = repairApi.repairBundle(bRepair, dryRun, context);
+        final BundleTimeline realRunBundleRepair = repairApi.repairBundle(bRepair, dryRun, context);
         assertTrue(testListener.isCompleted(5000));
-        
+
         aoRepair = getSubscriptionRepair(aoSubscription.getId(), realRunBundleRepair);
         assertEquals(aoRepair.getExistingEvents().size(), 2);
         index = 0;
-        for (ExistingEvent e : expected) {
-           validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));           
+        for (final ExistingEvent e : expected) {
+            validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));
         }
-        
-        newAoSubscription = (SubscriptionData)  entitlementApi.getSubscriptionFromId(aoSubscription.getId());
+
+        newAoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId());
         assertEquals(newAoSubscription.getState(), SubscriptionState.ACTIVE);
         assertEquals(newAoSubscription.getAllTransitions().size(), 2);
         assertEquals(newAoSubscription.getStartDate(), aoRecreateDate);
-        assertEquals(newAoSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);        
+        assertEquals(newAoSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
 
     }
-    
+
     // Fasten your seatbelt here:
     //
     // We are doing repair for multi-phase tiered-addon with different alignment:
@@ -670,95 +668,95 @@ public class TestRepairWithAO extends TestApiBaseRepair {
     // . Both multi phase
     // . Telescopic-Scope (bundle align) and Laser-Scope is Subscription align
     //
-    @Test(groups={"slow"})
+    @Test(groups = {"slow"})
     public void testRepairChangeAOOK() throws Exception {
-        
+
         log.info("Starting testRepairChangeAOOK");
-        
-        String baseProduct = "Shotgun";
-        BillingPeriod baseTerm = BillingPeriod.MONTHLY;
-        String basePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
+
+        final String baseProduct = "Shotgun";
+        final BillingPeriod baseTerm = BillingPeriod.MONTHLY;
+        final String basePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
 
         // CREATE BP
-        SubscriptionData baseSubscription = createSubscription(baseProduct, baseTerm, basePriceList);
+        final SubscriptionData baseSubscription = createSubscription(baseProduct, baseTerm, basePriceList);
 
         // MOVE CLOCK A LITTLE BIT-- STILL IN TRIAL
         Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(4));
         clock.addDeltaFromReality(it.toDurationMillis());
 
-        SubscriptionData aoSubscription = createSubscription("Telescopic-Scope", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME);
+        final SubscriptionData aoSubscription = createSubscription("Telescopic-Scope", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME);
 
         // MOVE CLOCK A LITTLE BIT MORE -- STILL IN TRIAL
         it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(3));
         clock.addDeltaFromReality(it.toDurationMillis());
-        
-        BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
+
+        final BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
         sortEventsOnBundle(bundleRepair);
-        
+
         // Quick check
-        SubscriptionTimeline bpRepair = getSubscriptionRepair(baseSubscription.getId(), bundleRepair);
+        final SubscriptionTimeline bpRepair = getSubscriptionRepair(baseSubscription.getId(), bundleRepair);
         assertEquals(bpRepair.getExistingEvents().size(), 2);
-        
+
         SubscriptionTimeline aoRepair = getSubscriptionRepair(aoSubscription.getId(), bundleRepair);
         assertEquals(aoRepair.getExistingEvents().size(), 2);
 
-        List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
-        des.add(createDeletedEvent(aoRepair.getExistingEvents().get(1).getEventId()));        
-        DateTime aoChangeDate = aoSubscription.getStartDate().plusDays(1);
-        PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Laser-Scope", ProductCategory.ADD_ON, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.TRIAL);
-        NewEvent ne = createNewEvent(SubscriptionTransitionType.CHANGE, aoChangeDate, spec);
-        
-        SubscriptionTimeline saoRepair = createSubscriptionRepair(aoSubscription.getId(), des, Collections.singletonList(ne));
-        
-        BundleTimeline bRepair =  createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(saoRepair));
-        
+        final List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
+        des.add(createDeletedEvent(aoRepair.getExistingEvents().get(1).getEventId()));
+        final DateTime aoChangeDate = aoSubscription.getStartDate().plusDays(1);
+        final PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Laser-Scope", ProductCategory.ADD_ON, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.TRIAL);
+        final NewEvent ne = createNewEvent(SubscriptionTransitionType.CHANGE, aoChangeDate, spec);
+
+        final SubscriptionTimeline saoRepair = createSubscriptionRepair(aoSubscription.getId(), des, Collections.singletonList(ne));
+
+        final BundleTimeline bRepair = createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(saoRepair));
+
         boolean dryRun = true;
-        BundleTimeline dryRunBundleRepair = repairApi.repairBundle(bRepair, dryRun, context);
-        
+        final BundleTimeline dryRunBundleRepair = repairApi.repairBundle(bRepair, dryRun, context);
+
         aoRepair = getSubscriptionRepair(aoSubscription.getId(), dryRunBundleRepair);
         assertEquals(aoRepair.getExistingEvents().size(), 3);
-        
-        
-        List<ExistingEvent> expected = new LinkedList<SubscriptionTimeline.ExistingEvent>();
+
+
+        final List<ExistingEvent> expected = new LinkedList<SubscriptionTimeline.ExistingEvent>();
         expected.add(createExistingEventForAssertion(SubscriptionTransitionType.CREATE, "Telescopic-Scope", PhaseType.DISCOUNT,
-                ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, aoSubscription.getStartDate()));
+                                                     ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, aoSubscription.getStartDate()));
         expected.add(createExistingEventForAssertion(SubscriptionTransitionType.CHANGE, "Laser-Scope", PhaseType.DISCOUNT,
-                ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, aoChangeDate));
+                                                     ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY, aoChangeDate));
         expected.add(createExistingEventForAssertion(SubscriptionTransitionType.PHASE, "Laser-Scope", PhaseType.EVERGREEN,
-                ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY,
-                aoSubscription.getStartDate().plusMonths(1) /* Subscription alignment */));
-                
+                                                     ProductCategory.ADD_ON, PriceListSet.DEFAULT_PRICELIST_NAME, BillingPeriod.MONTHLY,
+                                                     aoSubscription.getStartDate().plusMonths(1) /* Subscription alignment */));
+
         int index = 0;
-        for (ExistingEvent e : expected) {
-           validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));           
+        for (final ExistingEvent e : expected) {
+            validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));
         }
-        SubscriptionData newAoSubscription = (SubscriptionData)  entitlementApi.getSubscriptionFromId(aoSubscription.getId());
+        SubscriptionData newAoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId());
         assertEquals(newAoSubscription.getState(), SubscriptionState.ACTIVE);
         assertEquals(newAoSubscription.getAllTransitions().size(), 2);
-        
+
         // AND NOW COMMIT
         dryRun = false;
         testListener.pushExpectedEvent(NextEvent.REPAIR_BUNDLE);
-        BundleTimeline realRunBundleRepair = repairApi.repairBundle(bRepair, dryRun, context);
+        final BundleTimeline realRunBundleRepair = repairApi.repairBundle(bRepair, dryRun, context);
         assertTrue(testListener.isCompleted(5000));
-        
+
         aoRepair = getSubscriptionRepair(aoSubscription.getId(), realRunBundleRepair);
         assertEquals(aoRepair.getExistingEvents().size(), 3);
         index = 0;
-        for (ExistingEvent e : expected) {
-           validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));           
+        for (final ExistingEvent e : expected) {
+            validateExistingEventForAssertion(e, aoRepair.getExistingEvents().get(index++));
         }
-        
-        newAoSubscription = (SubscriptionData)  entitlementApi.getSubscriptionFromId(aoSubscription.getId());
+
+        newAoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId());
         assertEquals(newAoSubscription.getState(), SubscriptionState.ACTIVE);
         assertEquals(newAoSubscription.getAllTransitions().size(), 3);
-        
-        
+
+
         assertEquals(newAoSubscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION + 1);
         assertEquals(newAoSubscription.getBundleId(), bundle.getId());
         assertEquals(newAoSubscription.getStartDate(), aoSubscription.getStartDate());
 
-        Plan currentPlan = newAoSubscription.getCurrentPlan();
+        final Plan currentPlan = newAoSubscription.getCurrentPlan();
         assertNotNull(currentPlan);
         assertEquals(currentPlan.getProduct().getName(), "Laser-Scope");
         assertEquals(currentPlan.getProduct().getCategory(), ProductCategory.ADD_ON);
@@ -767,14 +765,14 @@ public class TestRepairWithAO extends TestApiBaseRepair {
         PlanPhase currentPhase = newAoSubscription.getCurrentPhase();
         assertNotNull(currentPhase);
         assertEquals(currentPhase.getPhaseType(), PhaseType.DISCOUNT);
-        
+
         testListener.pushExpectedEvent(NextEvent.PHASE);
-        
+
         it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(60));
         clock.addDeltaFromReality(it.toDurationMillis());
         assertTrue(testListener.isCompleted(5000));
-        
-        newAoSubscription = (SubscriptionData)  entitlementApi.getSubscriptionFromId(aoSubscription.getId());
+
+        newAoSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(aoSubscription.getId());
         currentPhase = newAoSubscription.getCurrentPhase();
         assertNotNull(currentPhase);
         assertEquals(currentPhase.getPhaseType(), PhaseType.EVERGREEN);

diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/api/timeline/TestRepairWithError.java b/entitlement/src/test/java/com/ning/billing/entitlement/api/timeline/TestRepairWithError.java
index e95d1fa..7c61f4f 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/api/timeline/TestRepairWithError.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/api/timeline/TestRepairWithError.java
@@ -15,9 +15,6 @@
  */
 package com.ning.billing.entitlement.api.timeline;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
@@ -46,12 +43,15 @@ import com.ning.billing.entitlement.api.user.Subscription;
 import com.ning.billing.entitlement.api.user.SubscriptionData;
 import com.ning.billing.entitlement.glue.MockEngineModuleMemory;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
 public class TestRepairWithError extends TestApiBaseRepair {
 
     private static final String baseProduct = "Shotgun";
     private TestWithException test;
     private Subscription baseSubscription;
-    private DateTime startDate;
+
     @Override
     public Injector getInjector() {
         return Guice.createInjector(Stage.DEVELOPMENT, new MockEngineModuleMemory());
@@ -61,226 +61,226 @@ public class TestRepairWithError extends TestApiBaseRepair {
     public void setupTest() throws Exception {
         super.setupTest();
         test = new TestWithException();
-        startDate = clock.getUTCNow();
+        final DateTime startDate = clock.getUTCNow();
         baseSubscription = createSubscription(baseProduct, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, startDate);
     }
-  
-    @Test(groups={"fast"})
+
+    @Test(groups = {"fast"})
     public void testENT_REPAIR_NEW_EVENT_BEFORE_LAST_BP_REMAINING() throws Exception {
-        
+
         log.info("Starting testENT_REPAIR_NEW_EVENT_BEFORE_LAST_BP_REMAINING");
-        
+
         test.withException(new TestWithExceptionCallback() {
             @Override
             public void doTest() throws EntitlementRepairException {
 
                 // MOVE AFTER TRIAL
                 testListener.pushExpectedEvent(NextEvent.PHASE);
-                
-                Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(40));
+
+                final Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(40));
                 clock.addDeltaFromReality(it.toDurationMillis());
 
                 assertTrue(testListener.isCompleted(5000));
-                
-                BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
+
+                final BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
                 sortEventsOnBundle(bundleRepair);
-                PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Assault-Rifle", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.EVERGREEN);
-                NewEvent ne = createNewEvent(SubscriptionTransitionType.CHANGE, baseSubscription.getStartDate().plusDays(10), spec);
-                
-                SubscriptionTimeline sRepair = createSubscriptionRepair(baseSubscription.getId(), Collections.<DeletedEvent>emptyList(), Collections.singletonList(ne));
-                
-                BundleTimeline bRepair =  createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(sRepair));
+                final PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Assault-Rifle", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.EVERGREEN);
+                final NewEvent ne = createNewEvent(SubscriptionTransitionType.CHANGE, baseSubscription.getStartDate().plusDays(10), spec);
+
+                final SubscriptionTimeline sRepair = createSubscriptionRepair(baseSubscription.getId(), Collections.<DeletedEvent>emptyList(), Collections.singletonList(ne));
+
+                final BundleTimeline bRepair = createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(sRepair));
 
                 repairApi.repairBundle(bRepair, true, context);
             }
         }, ErrorCode.ENT_REPAIR_NEW_EVENT_BEFORE_LAST_BP_REMAINING);
     }
-    
-    @Test(groups={"fast"})
+
+    @Test(groups = {"fast"})
     public void testENT_REPAIR_INVALID_DELETE_SET() throws Exception {
-        
+
         log.info("Starting testENT_REPAIR_INVALID_DELETE_SET");
-        
+
         test.withException(new TestWithExceptionCallback() {
             @Override
             public void doTest() throws EntitlementRepairException, EntitlementUserApiException {
 
                 Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(3));
                 clock.addDeltaFromReality(it.toDurationMillis());
-                
+
                 testListener.pushExpectedEvent(NextEvent.CHANGE);
-                DateTime changeTime = clock.getUTCNow();
+                final DateTime changeTime = clock.getUTCNow();
                 baseSubscription.changePlan("Assault-Rifle", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, changeTime, context);
                 assertTrue(testListener.isCompleted(5000));
-                
+
                 // MOVE AFTER TRIAL
                 testListener.pushExpectedEvent(NextEvent.PHASE);
                 it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(40));
                 clock.addDeltaFromReality(it.toDurationMillis());
                 assertTrue(testListener.isCompleted(5000));
-                
-                BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
+
+                final BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
                 sortEventsOnBundle(bundleRepair);
-                PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Assault-Rifle", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.EVERGREEN);
-                NewEvent ne = createNewEvent(SubscriptionTransitionType.CHANGE, baseSubscription.getStartDate().plusDays(10), spec);
-                DeletedEvent de = createDeletedEvent(bundleRepair.getSubscriptions().get(0).getExistingEvents().get(1).getEventId());                
+                final PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Assault-Rifle", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.EVERGREEN);
+                final NewEvent ne = createNewEvent(SubscriptionTransitionType.CHANGE, baseSubscription.getStartDate().plusDays(10), spec);
+                final DeletedEvent de = createDeletedEvent(bundleRepair.getSubscriptions().get(0).getExistingEvents().get(1).getEventId());
 
-                SubscriptionTimeline sRepair = createSubscriptionRepair(baseSubscription.getId(), Collections.singletonList(de), Collections.singletonList(ne));
-                BundleTimeline bRepair =  createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(sRepair));
+                final SubscriptionTimeline sRepair = createSubscriptionRepair(baseSubscription.getId(), Collections.singletonList(de), Collections.singletonList(ne));
+                final BundleTimeline bRepair = createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(sRepair));
 
                 repairApi.repairBundle(bRepair, true, context);
             }
         }, ErrorCode.ENT_REPAIR_INVALID_DELETE_SET);
     }
 
-    @Test(groups={"fast"})
+    @Test(groups = {"fast"})
     public void testENT_REPAIR_NON_EXISTENT_DELETE_EVENT() throws Exception {
-        
+
         log.info("Starting testENT_REPAIR_NON_EXISTENT_DELETE_EVENT");
-        
+
         test.withException(new TestWithExceptionCallback() {
             @Override
             public void doTest() throws EntitlementRepairException {
-                
-                BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
+
+                final BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
                 sortEventsOnBundle(bundleRepair);
-                PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Assault-Rifle", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.EVERGREEN);
-                NewEvent ne = createNewEvent(SubscriptionTransitionType.CHANGE, baseSubscription.getStartDate().plusDays(10), spec);
-                DeletedEvent de = createDeletedEvent(UUID.randomUUID());
-                SubscriptionTimeline sRepair = createSubscriptionRepair(baseSubscription.getId(), Collections.singletonList(de), Collections.singletonList(ne));
-                
-                BundleTimeline bRepair =  createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(sRepair));
+                final PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Assault-Rifle", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.EVERGREEN);
+                final NewEvent ne = createNewEvent(SubscriptionTransitionType.CHANGE, baseSubscription.getStartDate().plusDays(10), spec);
+                final DeletedEvent de = createDeletedEvent(UUID.randomUUID());
+                final SubscriptionTimeline sRepair = createSubscriptionRepair(baseSubscription.getId(), Collections.singletonList(de), Collections.singletonList(ne));
+
+                final BundleTimeline bRepair = createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(sRepair));
 
                 repairApi.repairBundle(bRepair, true, context);
             }
         }, ErrorCode.ENT_REPAIR_NON_EXISTENT_DELETE_EVENT);
     }
-    
-    @Test(groups={"fast"})
+
+    @Test(groups = {"fast"})
     public void testENT_REPAIR_SUB_RECREATE_NOT_EMPTY() throws Exception {
-        
+
         log.info("Starting testENT_REPAIR_SUB_RECREATE_NOT_EMPTY");
-        
+
         test.withException(new TestWithExceptionCallback() {
             @Override
             public void doTest() throws EntitlementRepairException {
-                
+
                 // MOVE AFTER TRIAL
-                   testListener.pushExpectedEvent(NextEvent.PHASE);
-                   Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(40));
-                   clock.addDeltaFromReality(it.toDurationMillis());
-                   assertTrue(testListener.isCompleted(5000));
-                   
-                   BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
-                   sortEventsOnBundle(bundleRepair);
-                   PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Assault-Rifle", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.EVERGREEN);
-                   NewEvent ne = createNewEvent(SubscriptionTransitionType.CREATE, baseSubscription.getStartDate().plusDays(10), spec);
-                   List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
-                   des.add(createDeletedEvent(bundleRepair.getSubscriptions().get(0).getExistingEvents().get(1).getEventId()));                
-                   SubscriptionTimeline sRepair = createSubscriptionRepair(baseSubscription.getId(), des, Collections.singletonList(ne));
-                   
-                   BundleTimeline bRepair =  createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(sRepair));
-
-                   repairApi.repairBundle(bRepair, true, context);
-                
+                testListener.pushExpectedEvent(NextEvent.PHASE);
+                final Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(40));
+                clock.addDeltaFromReality(it.toDurationMillis());
+                assertTrue(testListener.isCompleted(5000));
+
+                final BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
+                sortEventsOnBundle(bundleRepair);
+                final PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Assault-Rifle", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.EVERGREEN);
+                final NewEvent ne = createNewEvent(SubscriptionTransitionType.CREATE, baseSubscription.getStartDate().plusDays(10), spec);
+                final List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
+                des.add(createDeletedEvent(bundleRepair.getSubscriptions().get(0).getExistingEvents().get(1).getEventId()));
+                final SubscriptionTimeline sRepair = createSubscriptionRepair(baseSubscription.getId(), des, Collections.singletonList(ne));
+
+                final BundleTimeline bRepair = createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(sRepair));
+
+                repairApi.repairBundle(bRepair, true, context);
+
             }
         }, ErrorCode.ENT_REPAIR_SUB_RECREATE_NOT_EMPTY);
     }
 
-    @Test(groups={"fast"})
+    @Test(groups = {"fast"})
     public void testENT_REPAIR_SUB_EMPTY() throws Exception {
 
         log.info("Starting testENT_REPAIR_SUB_EMPTY");
-        
+
         test.withException(new TestWithExceptionCallback() {
 
             @Override
             public void doTest() throws EntitlementRepairException {
-                
-             // MOVE AFTER TRIAL
+
+                // MOVE AFTER TRIAL
                 testListener.pushExpectedEvent(NextEvent.PHASE);
-                Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(40));
+                final Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(40));
                 clock.addDeltaFromReality(it.toDurationMillis());
                 assertTrue(testListener.isCompleted(5000));
-                
-                BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
+
+                final BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
                 sortEventsOnBundle(bundleRepair);
-                PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Assault-Rifle", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.EVERGREEN);
-                NewEvent ne = createNewEvent(SubscriptionTransitionType.CHANGE, baseSubscription.getStartDate().plusDays(10), spec);
-                List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
-                des.add(createDeletedEvent(bundleRepair.getSubscriptions().get(0).getExistingEvents().get(0).getEventId()));                
-                des.add(createDeletedEvent(bundleRepair.getSubscriptions().get(0).getExistingEvents().get(1).getEventId()));                                
-                SubscriptionTimeline sRepair = createSubscriptionRepair(baseSubscription.getId(), des, Collections.singletonList(ne));
-                
-                BundleTimeline bRepair =  createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(sRepair));
+                final PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Assault-Rifle", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.EVERGREEN);
+                final NewEvent ne = createNewEvent(SubscriptionTransitionType.CHANGE, baseSubscription.getStartDate().plusDays(10), spec);
+                final List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
+                des.add(createDeletedEvent(bundleRepair.getSubscriptions().get(0).getExistingEvents().get(0).getEventId()));
+                des.add(createDeletedEvent(bundleRepair.getSubscriptions().get(0).getExistingEvents().get(1).getEventId()));
+                final SubscriptionTimeline sRepair = createSubscriptionRepair(baseSubscription.getId(), des, Collections.singletonList(ne));
+
+                final BundleTimeline bRepair = createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(sRepair));
 
                 repairApi.repairBundle(bRepair, true, context);
             }
         }, ErrorCode.ENT_REPAIR_SUB_EMPTY);
     }
-    
-    @Test(groups={"fast"})
+
+    @Test(groups = {"fast"})
     public void testENT_REPAIR_AO_CREATE_BEFORE_BP_START() throws Exception {
-        
+
         log.info("Starting testENT_REPAIR_AO_CREATE_BEFORE_BP_START");
-        
+
         test.withException(new TestWithExceptionCallback() {
             @Override
             public void doTest() throws EntitlementRepairException, EntitlementUserApiException {
-               
+
 
                 // MOVE CLOCK A LITTLE BIT-- STILL IN TRIAL
                 Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(4));
                 clock.addDeltaFromReality(it.toDurationMillis());
-                SubscriptionData aoSubscription = createSubscription("Telescopic-Scope", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME);
+                final SubscriptionData aoSubscription = createSubscription("Telescopic-Scope", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME);
 
                 // MOVE CLOCK A LITTLE BIT MORE -- STILL IN TRIAL
                 it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(4));
                 clock.addDeltaFromReality(it.toDurationMillis());
 
-                BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
+                final BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
                 sortEventsOnBundle(bundleRepair);
-                
+
                 // Quick check
-                SubscriptionTimeline bpRepair = getSubscriptionRepair(baseSubscription.getId(), bundleRepair);
+                final SubscriptionTimeline bpRepair = getSubscriptionRepair(baseSubscription.getId(), bundleRepair);
                 assertEquals(bpRepair.getExistingEvents().size(), 2);
-                
-                SubscriptionTimeline aoRepair = getSubscriptionRepair(aoSubscription.getId(), bundleRepair);
+
+                final SubscriptionTimeline aoRepair = getSubscriptionRepair(aoSubscription.getId(), bundleRepair);
                 assertEquals(aoRepair.getExistingEvents().size(), 2);
-                
 
-                List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
-                des.add(createDeletedEvent(aoRepair.getExistingEvents().get(0).getEventId()));        
+
+                final List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
+                des.add(createDeletedEvent(aoRepair.getExistingEvents().get(0).getEventId()));
                 des.add(createDeletedEvent(aoRepair.getExistingEvents().get(1).getEventId()));
 
-                DateTime aoRecreateDate = aoSubscription.getStartDate().minusDays(5);
-                PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Telescopic-Scope", ProductCategory.ADD_ON, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.DISCOUNT);
-                NewEvent ne = createNewEvent(SubscriptionTransitionType.CREATE, aoRecreateDate, spec);
-                
-                SubscriptionTimeline saoRepair = createSubscriptionRepair(aoSubscription.getId(), des, Collections.singletonList(ne));
-                
-                BundleTimeline bRepair =  createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(saoRepair));
-                
-                boolean dryRun = true;
+                final DateTime aoRecreateDate = aoSubscription.getStartDate().minusDays(5);
+                final PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Telescopic-Scope", ProductCategory.ADD_ON, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.DISCOUNT);
+                final NewEvent ne = createNewEvent(SubscriptionTransitionType.CREATE, aoRecreateDate, spec);
+
+                final SubscriptionTimeline saoRepair = createSubscriptionRepair(aoSubscription.getId(), des, Collections.singletonList(ne));
+
+                final BundleTimeline bRepair = createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(saoRepair));
+
+                final boolean dryRun = true;
                 repairApi.repairBundle(bRepair, dryRun, context);
             }
         }, ErrorCode.ENT_REPAIR_AO_CREATE_BEFORE_BP_START);
     }
-    
-    @Test(groups={"fast"})
+
+    @Test(groups = {"fast"})
     public void testENT_REPAIR_NEW_EVENT_BEFORE_LAST_AO_REMAINING() throws Exception {
-        
+
         log.info("Starting testENT_REPAIR_NEW_EVENT_BEFORE_LAST_AO_REMAINING");
-        
+
         test.withException(new TestWithExceptionCallback() {
             @Override
             public void doTest() throws EntitlementRepairException, EntitlementUserApiException {
-                
+
 
                 // MOVE CLOCK A LITTLE BIT-- STILL IN TRIAL
                 Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(4));
                 clock.addDeltaFromReality(it.toDurationMillis());
-                SubscriptionData aoSubscription = createSubscription("Telescopic-Scope", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME);
+                final SubscriptionData aoSubscription = createSubscription("Telescopic-Scope", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME);
 
                 // MOVE CLOCK A LITTLE BIT MORE -- STILL IN TRIAL
                 it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(4));
@@ -288,80 +288,80 @@ public class TestRepairWithError extends TestApiBaseRepair {
 
                 BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
                 sortEventsOnBundle(bundleRepair);
-                
+
                 // Quick check
-                SubscriptionTimeline bpRepair = getSubscriptionRepair(baseSubscription.getId(), bundleRepair);
+                final SubscriptionTimeline bpRepair = getSubscriptionRepair(baseSubscription.getId(), bundleRepair);
                 assertEquals(bpRepair.getExistingEvents().size(), 2);
-                
-                SubscriptionTimeline aoRepair = getSubscriptionRepair(aoSubscription.getId(), bundleRepair);
+
+                final SubscriptionTimeline aoRepair = getSubscriptionRepair(aoSubscription.getId(), bundleRepair);
                 assertEquals(aoRepair.getExistingEvents().size(), 2);
-                
 
-                List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
+
+                final List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
                 //des.add(createDeletedEvent(aoRepair.getExistingEvents().get(1).getEventId()));        
-                DateTime aoCancelDate = aoSubscription.getStartDate().plusDays(10);
-                
-                NewEvent ne = createNewEvent(SubscriptionTransitionType.CANCEL, aoCancelDate, null);
-                
-                SubscriptionTimeline saoRepair = createSubscriptionRepair(aoSubscription.getId(), des, Collections.singletonList(ne));
-                
-                bundleRepair =  createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(saoRepair));
-                
-                boolean dryRun = true;
+                final DateTime aoCancelDate = aoSubscription.getStartDate().plusDays(10);
+
+                final NewEvent ne = createNewEvent(SubscriptionTransitionType.CANCEL, aoCancelDate, null);
+
+                final SubscriptionTimeline saoRepair = createSubscriptionRepair(aoSubscription.getId(), des, Collections.singletonList(ne));
+
+                bundleRepair = createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(saoRepair));
+
+                final boolean dryRun = true;
                 repairApi.repairBundle(bundleRepair, dryRun, context);
             }
         }, ErrorCode.ENT_REPAIR_NEW_EVENT_BEFORE_LAST_AO_REMAINING);
     }
 
 
-    @Test(groups={"fast"})
+    @Test(groups = {"fast"})
     public void testENT_REPAIR_BP_RECREATE_MISSING_AO() throws Exception {
-        
+
         log.info("Starting testENT_REPAIR_BP_RECREATE_MISSING_AO");
-        
+
         test.withException(new TestWithExceptionCallback() {
             @Override
             public void doTest() throws EntitlementRepairException, EntitlementUserApiException {
 
-              //testListener.pushExpectedEvent(NextEvent.PHASE);
+                //testListener.pushExpectedEvent(NextEvent.PHASE);
 
-                Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(4));
+                final Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(4));
                 clock.addDeltaFromReality(it.toDurationMillis());
                 //assertTrue(testListener.isCompleted(5000));
 
-                SubscriptionData aoSubscription = createSubscription("Laser-Scope", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME);
-                
-                BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
+                final SubscriptionData aoSubscription = createSubscription("Laser-Scope", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME);
+
+                final BundleTimeline bundleRepair = repairApi.getBundleRepair(bundle.getId());
                 sortEventsOnBundle(bundleRepair);
-                
-                DateTime newCreateTime = baseSubscription.getStartDate().plusDays(3);
 
-                PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Pistol", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.TRIAL);
+                final DateTime newCreateTime = baseSubscription.getStartDate().plusDays(3);
 
-                NewEvent ne = createNewEvent(SubscriptionTransitionType.CREATE, newCreateTime, spec);
-                List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
+                final PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Pistol", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, PhaseType.TRIAL);
+
+                final NewEvent ne = createNewEvent(SubscriptionTransitionType.CREATE, newCreateTime, spec);
+                final List<DeletedEvent> des = new LinkedList<SubscriptionTimeline.DeletedEvent>();
                 des.add(createDeletedEvent(bundleRepair.getSubscriptions().get(0).getExistingEvents().get(0).getEventId()));
                 des.add(createDeletedEvent(bundleRepair.getSubscriptions().get(0).getExistingEvents().get(1).getEventId()));
 
-                SubscriptionTimeline sRepair = createSubscriptionRepair(baseSubscription.getId(), des, Collections.singletonList(ne));
-                
+                final SubscriptionTimeline sRepair = createSubscriptionRepair(baseSubscription.getId(), des, Collections.singletonList(ne));
+
                 // FIRST ISSUE DRY RUN
-                BundleTimeline bRepair =  createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(sRepair));
-                
-                boolean dryRun = true;
+                final BundleTimeline bRepair = createBundleRepair(bundle.getId(), bundleRepair.getViewId(), Collections.singletonList(sRepair));
+
+                final boolean dryRun = true;
                 repairApi.repairBundle(bRepair, dryRun, context);
             }
         }, ErrorCode.ENT_REPAIR_BP_RECREATE_MISSING_AO);
     }
-    
+
     //
     // CAN'T seem to trigger such case easily, other errors trigger before...
     //
-    @Test(groups={"fast"}, enabled=false)
+    @Test(groups = {"fast"}, enabled = false)
     public void testENT_REPAIR_BP_RECREATE_MISSING_AO_CREATE() throws Exception {
-        
+
         log.info("Starting testENT_REPAIR_BP_RECREATE_MISSING_AO_CREATE");
-        
+
         test.withException(new TestWithExceptionCallback() {
             @Override
             public void doTest() throws EntitlementRepairException, EntitlementUserApiException {
@@ -405,17 +405,17 @@ public class TestRepairWithError extends TestApiBaseRepair {
             }
         }, ErrorCode.ENT_REPAIR_BP_RECREATE_MISSING_AO_CREATE);
     }
-    
-    @Test(groups={"fast"}, enabled=false)
+
+    @Test(groups = {"fast"}, enabled = false)
     public void testENT_REPAIR_MISSING_AO_DELETE_EVENT() throws Exception {
-        
+
         log.info("Starting testENT_REPAIR_MISSING_AO_DELETE_EVENT");
-        
+
         test.withException(new TestWithExceptionCallback() {
             @Override
             public void doTest() throws EntitlementRepairException, EntitlementUserApiException {
 
-                
+
                 /*
                 // MOVE CLOCK -- JUST BEFORE END OF TRIAL
                  *                 
@@ -457,7 +457,7 @@ public class TestRepairWithError extends TestApiBaseRepair {
                 boolean dryRun = false;
                 repairApi.repairBundle(bundleRepair, dryRun, context);
                 */
-                }
+            }
         }, ErrorCode.ENT_REPAIR_MISSING_AO_DELETE_EVENT);
     }
 

diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiAddOn.java b/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiAddOn.java
index 9aede3c..68b1978 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiAddOn.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiAddOn.java
@@ -16,11 +16,6 @@
 
 package com.ning.billing.entitlement.api.user;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-
 import java.util.List;
 
 import org.joda.time.DateTime;
@@ -48,6 +43,11 @@ import com.ning.billing.entitlement.api.user.SubscriptionStatusDryRun.DryRunChan
 import com.ning.billing.entitlement.glue.MockEngineModuleSql;
 import com.ning.billing.util.clock.DefaultClock;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+
 public class TestUserApiAddOn extends TestApiBase {
 
     @Override
@@ -55,26 +55,26 @@ public class TestUserApiAddOn extends TestApiBase {
         return Guice.createInjector(Stage.DEVELOPMENT, new MockEngineModuleSql());
     }
 
-    @Test(enabled=true, groups={"slow"})
+    @Test(enabled = true, groups = {"slow"})
     public void testCreateCancelAddon() {
 
         log.info("Starting testCreateCancelAddon");
 
         try {
-            String baseProduct = "Shotgun";
-            BillingPeriod baseTerm = BillingPeriod.MONTHLY;
-            String basePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
+            final String baseProduct = "Shotgun";
+            final BillingPeriod baseTerm = BillingPeriod.MONTHLY;
+            final String basePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
 
             createSubscription(baseProduct, baseTerm, basePriceList);
 
-            String aoProduct = "Telescopic-Scope";
-            BillingPeriod aoTerm = BillingPeriod.MONTHLY;
-            String aoPriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
+            final String aoProduct = "Telescopic-Scope";
+            final BillingPeriod aoTerm = BillingPeriod.MONTHLY;
+            final String aoPriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
 
-            SubscriptionData aoSubscription = createSubscription(aoProduct, aoTerm, aoPriceList);
+            final SubscriptionData aoSubscription = createSubscription(aoProduct, aoTerm, aoPriceList);
             assertEquals(aoSubscription.getState(), SubscriptionState.ACTIVE);
 
-            DateTime now = clock.getUTCNow();
+            final DateTime now = clock.getUTCNow();
             aoSubscription.cancel(now, false, context);
 
             testListener.reset();
@@ -89,23 +89,23 @@ public class TestUserApiAddOn extends TestApiBase {
         }
     }
 
-    @Test(enabled=true, groups={"slow"})
+    @Test(enabled = true, groups = {"slow"})
     public void testCancelBPWithAddon() {
 
         log.info("Starting testCancelBPWithAddon");
 
         try {
 
-            String baseProduct = "Shotgun";
-            BillingPeriod baseTerm = BillingPeriod.MONTHLY;
-            String basePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
+            final String baseProduct = "Shotgun";
+            final BillingPeriod baseTerm = BillingPeriod.MONTHLY;
+            final String basePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
 
             // CREATE BP
             SubscriptionData baseSubscription = createSubscription(baseProduct, baseTerm, basePriceList);
 
-            String aoProduct = "Telescopic-Scope";
-            BillingPeriod aoTerm = BillingPeriod.MONTHLY;
-            String aoPriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
+            final String aoProduct = "Telescopic-Scope";
+            final BillingPeriod aoTerm = BillingPeriod.MONTHLY;
+            final String aoPriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
 
             SubscriptionData aoSubscription = createSubscription(aoProduct, aoTerm, aoPriceList);
 
@@ -119,10 +119,10 @@ public class TestUserApiAddOn extends TestApiBase {
             assertTrue(testListener.isCompleted(5000));
 
             // SET CTD TO CANCEL IN FUTURE
-            DateTime now = clock.getUTCNow();
-            Duration ctd = getDurationMonth(1);
+            final DateTime now = clock.getUTCNow();
+            final Duration ctd = getDurationMonth(1);
             // Why not just use clock.getUTCNow().plusMonths(1) ?
-            DateTime newChargedThroughDate = DefaultClock.addDuration(now, ctd);
+            final DateTime newChargedThroughDate = DefaultClock.addDuration(now, ctd);
             billingApi.setChargedThroughDate(baseSubscription.getId(), newChargedThroughDate, context);
             baseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId());
 
@@ -138,7 +138,7 @@ public class TestUserApiAddOn extends TestApiBase {
             testListener.reset();
             testListener.pushExpectedEvent(NextEvent.CANCEL);
             testListener.pushExpectedEvent(NextEvent.CANCEL);
-            
+
             it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusMonths(1));
             clock.addDeltaFromReality(it.toDurationMillis());
             assertTrue(testListener.isCompleted(5000));
@@ -155,23 +155,23 @@ public class TestUserApiAddOn extends TestApiBase {
     }
 
 
-    @Test(enabled=true, groups={"slow"})
+    @Test(enabled = true, groups = {"slow"})
     public void testChangeBPWithAddonIncluded() {
 
         log.info("Starting testChangeBPWithAddonIncluded");
 
         try {
 
-            String baseProduct = "Shotgun";
-            BillingPeriod baseTerm = BillingPeriod.MONTHLY;
-            String basePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
+            final String baseProduct = "Shotgun";
+            final BillingPeriod baseTerm = BillingPeriod.MONTHLY;
+            final String basePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
 
             // CREATE BP
             SubscriptionData baseSubscription = createSubscription(baseProduct, baseTerm, basePriceList);
 
-            String aoProduct = "Telescopic-Scope";
-            BillingPeriod aoTerm = BillingPeriod.MONTHLY;
-            String aoPriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
+            final String aoProduct = "Telescopic-Scope";
+            final BillingPeriod aoTerm = BillingPeriod.MONTHLY;
+            final String aoPriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
 
             SubscriptionData aoSubscription = createSubscription(aoProduct, aoTerm, aoPriceList);
 
@@ -180,31 +180,31 @@ public class TestUserApiAddOn extends TestApiBase {
             testListener.pushExpectedEvent(NextEvent.PHASE);
 
             // MOVE CLOCK AFTER TRIAL + AO DISCOUNT
-            Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusMonths(2));
+            final Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusMonths(2));
             clock.addDeltaFromReality(it.toDurationMillis());
             assertTrue(testListener.isCompleted(5000));
 
             // SET CTD TO CHANGE IN FUTURE
-            DateTime now = clock.getUTCNow();
-            Duration ctd = getDurationMonth(1);
-            DateTime newChargedThroughDate = DefaultClock.addDuration(now, ctd);
+            final DateTime now = clock.getUTCNow();
+            final Duration ctd = getDurationMonth(1);
+            final DateTime newChargedThroughDate = DefaultClock.addDuration(now, ctd);
             billingApi.setChargedThroughDate(baseSubscription.getId(), newChargedThroughDate, context);
             baseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId());
 
             // CHANGE IMMEDIATELY WITH TO BP WITH NON INCLUDED ADDON
-            String newBaseProduct = "Assault-Rifle";
-            BillingPeriod newBaseTerm = BillingPeriod.MONTHLY;
-            String newBasePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
+            final String newBaseProduct = "Assault-Rifle";
+            final BillingPeriod newBaseTerm = BillingPeriod.MONTHLY;
+            final String newBasePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
 
-            List<SubscriptionStatusDryRun> aoStatus = entitlementApi.getDryRunChangePlanStatus(baseSubscription.getId(), newBaseProduct, now);
+            final List<SubscriptionStatusDryRun> aoStatus = entitlementApi.getDryRunChangePlanStatus(baseSubscription.getId(), newBaseProduct, now);
             assertEquals(aoStatus.size(), 1);
             assertEquals(aoStatus.get(0).getId(), aoSubscription.getId());
             assertEquals(aoStatus.get(0).getProductName(), aoProduct);
-            assertEquals(aoStatus.get(0).getBillingPeriod(), aoTerm);            
-            assertEquals(aoStatus.get(0).getPhaseType(), aoSubscription.getCurrentPhase().getPhaseType());                        
+            assertEquals(aoStatus.get(0).getBillingPeriod(), aoTerm);
+            assertEquals(aoStatus.get(0).getPhaseType(), aoSubscription.getCurrentPhase().getPhaseType());
             assertEquals(aoStatus.get(0).getPriceList(), aoSubscription.getCurrentPriceList().getName());
-            assertEquals(aoStatus.get(0).getReason(), DryRunChangeReason.AO_INCLUDED_IN_NEW_PLAN);            
-            
+            assertEquals(aoStatus.get(0).getReason(), DryRunChangeReason.AO_INCLUDED_IN_NEW_PLAN);
+
             testListener.reset();
             testListener.pushExpectedEvent(NextEvent.CHANGE);
             testListener.pushExpectedEvent(NextEvent.CANCEL);
@@ -221,23 +221,23 @@ public class TestUserApiAddOn extends TestApiBase {
         }
     }
 
-    @Test(enabled=true, groups={"slow"})
+    @Test(enabled = true, groups = {"slow"})
     public void testChangeBPWithAddonNonAvailable() {
 
         log.info("Starting testChangeBPWithAddonNonAvailable");
 
         try {
 
-            String baseProduct = "Shotgun";
-            BillingPeriod baseTerm = BillingPeriod.MONTHLY;
-            String basePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
+            final String baseProduct = "Shotgun";
+            final BillingPeriod baseTerm = BillingPeriod.MONTHLY;
+            final String basePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
 
             // CREATE BP
             SubscriptionData baseSubscription = createSubscription(baseProduct, baseTerm, basePriceList);
 
-            String aoProduct = "Telescopic-Scope";
-            BillingPeriod aoTerm = BillingPeriod.MONTHLY;
-            String aoPriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
+            final String aoProduct = "Telescopic-Scope";
+            final BillingPeriod aoTerm = BillingPeriod.MONTHLY;
+            final String aoPriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
 
             SubscriptionData aoSubscription = createSubscription(aoProduct, aoTerm, aoPriceList);
 
@@ -251,26 +251,26 @@ public class TestUserApiAddOn extends TestApiBase {
             assertTrue(testListener.isCompleted(5000));
 
             // SET CTD TO CANCEL IN FUTURE
-            DateTime now = clock.getUTCNow();
-            Duration ctd = getDurationMonth(1);
-            DateTime newChargedThroughDate = DefaultClock.addDuration(now, ctd);
+            final DateTime now = clock.getUTCNow();
+            final Duration ctd = getDurationMonth(1);
+            final DateTime newChargedThroughDate = DefaultClock.addDuration(now, ctd);
             billingApi.setChargedThroughDate(baseSubscription.getId(), newChargedThroughDate, context);
             baseSubscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(baseSubscription.getId());
 
             // CHANGE IMMEDIATELY WITH TO BP WITH NON AVAILABLE ADDON
-            String newBaseProduct = "Pistol";
-            BillingPeriod newBaseTerm = BillingPeriod.MONTHLY;
-            String newBasePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
+            final String newBaseProduct = "Pistol";
+            final BillingPeriod newBaseTerm = BillingPeriod.MONTHLY;
+            final String newBasePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
 
-            List<SubscriptionStatusDryRun> aoStatus = entitlementApi.getDryRunChangePlanStatus(baseSubscription.getId(), newBaseProduct, now);
+            final List<SubscriptionStatusDryRun> aoStatus = entitlementApi.getDryRunChangePlanStatus(baseSubscription.getId(), newBaseProduct, now);
             assertEquals(aoStatus.size(), 1);
             assertEquals(aoStatus.get(0).getId(), aoSubscription.getId());
             assertEquals(aoStatus.get(0).getProductName(), aoProduct);
-            assertEquals(aoStatus.get(0).getBillingPeriod(), aoTerm);   
-            assertEquals(aoStatus.get(0).getPhaseType(), aoSubscription.getCurrentPhase().getPhaseType());                                    
+            assertEquals(aoStatus.get(0).getBillingPeriod(), aoTerm);
+            assertEquals(aoStatus.get(0).getPhaseType(), aoSubscription.getCurrentPhase().getPhaseType());
             assertEquals(aoStatus.get(0).getPriceList(), aoSubscription.getCurrentPriceList().getName());
-            assertEquals(aoStatus.get(0).getReason(), DryRunChangeReason.AO_NOT_AVAILABLE_IN_NEW_PLAN);            
-            
+            assertEquals(aoStatus.get(0).getReason(), DryRunChangeReason.AO_NOT_AVAILABLE_IN_NEW_PLAN);
+
             baseSubscription.changePlan(newBaseProduct, newBaseTerm, newBasePriceList, now, context);
 
             // REFETCH AO SUBSCRIPTION AND CHECK THIS IS ACTIVE
@@ -298,22 +298,22 @@ public class TestUserApiAddOn extends TestApiBase {
     }
 
 
-    @Test(enabled=true, groups={"slow"})
+    @Test(enabled = true, groups = {"slow"})
     public void testAddonCreateWithBundleAlign() {
 
         log.info("Starting testAddonCreateWithBundleAlign");
 
         try {
-            String aoProduct = "Telescopic-Scope";
-            BillingPeriod aoTerm = BillingPeriod.MONTHLY;
-            String aoPriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
+            final String aoProduct = "Telescopic-Scope";
+            final BillingPeriod aoTerm = BillingPeriod.MONTHLY;
+            final String aoPriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
 
             // This is just to double check our test catalog gives us what we want before we start the test
-            PlanSpecifier planSpecifier = new PlanSpecifier(aoProduct,
-                    ProductCategory.ADD_ON,
-                    aoTerm,
-                    aoPriceList);
-            PlanAlignmentCreate alignement = catalog.planCreateAlignment(planSpecifier, clock.getUTCNow());
+            final PlanSpecifier planSpecifier = new PlanSpecifier(aoProduct,
+                                                            ProductCategory.ADD_ON,
+                                                            aoTerm,
+                                                            aoPriceList);
+            final PlanAlignmentCreate alignement = catalog.planCreateAlignment(planSpecifier, clock.getUTCNow());
             assertEquals(alignement, PlanAlignmentCreate.START_OF_BUNDLE);
 
             testAddonCreateInternal(aoProduct, aoTerm, aoPriceList, alignement);
@@ -324,22 +324,22 @@ public class TestUserApiAddOn extends TestApiBase {
         }
     }
 
-    @Test(enabled=true, groups={"slow"})
+    @Test(enabled = true, groups = {"slow"})
     public void testAddonCreateWithSubscriptionAlign() {
 
         log.info("Starting testAddonCreateWithSubscriptionAlign");
 
         try {
-            String aoProduct = "Laser-Scope";
-            BillingPeriod aoTerm = BillingPeriod.MONTHLY;
-            String aoPriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
+            final String aoProduct = "Laser-Scope";
+            final BillingPeriod aoTerm = BillingPeriod.MONTHLY;
+            final String aoPriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
 
             // This is just to double check our test catalog gives us what we want before we start the test
-            PlanSpecifier planSpecifier = new PlanSpecifier(aoProduct,
-                    ProductCategory.ADD_ON,
-                    aoTerm,
-                    aoPriceList);
-            PlanAlignmentCreate alignement = catalog.planCreateAlignment(planSpecifier, clock.getUTCNow());
+            final PlanSpecifier planSpecifier = new PlanSpecifier(aoProduct,
+                                                            ProductCategory.ADD_ON,
+                                                            aoTerm,
+                                                            aoPriceList);
+            final PlanAlignmentCreate alignement = catalog.planCreateAlignment(planSpecifier, clock.getUTCNow());
             assertEquals(alignement, PlanAlignmentCreate.START_OF_SUBSCRIPTION);
 
             testAddonCreateInternal(aoProduct, aoTerm, aoPriceList, alignement);
@@ -351,30 +351,30 @@ public class TestUserApiAddOn extends TestApiBase {
     }
 
 
-    private void testAddonCreateInternal(String aoProduct, BillingPeriod aoTerm, String aoPriceList, PlanAlignmentCreate expAlignement) {
+    private void testAddonCreateInternal(final String aoProduct, final BillingPeriod aoTerm, final String aoPriceList, final PlanAlignmentCreate expAlignement) {
 
         try {
 
-            String baseProduct = "Shotgun";
-            BillingPeriod baseTerm = BillingPeriod.MONTHLY;
-            String basePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
+            final String baseProduct = "Shotgun";
+            final BillingPeriod baseTerm = BillingPeriod.MONTHLY;
+            final String basePriceList = PriceListSet.DEFAULT_PRICELIST_NAME;
 
             // CREATE BP
-            SubscriptionData baseSubscription = createSubscription(baseProduct, baseTerm, basePriceList);
+            final SubscriptionData baseSubscription = createSubscription(baseProduct, baseTerm, basePriceList);
 
             // MOVE CLOCK 14 DAYS LATER
             Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(14));
             clock.addDeltaFromReality(it.toDurationMillis());
-  
+
             // CREATE ADDON
-            DateTime beforeAOCreation = clock.getUTCNow();
+            final DateTime beforeAOCreation = clock.getUTCNow();
             SubscriptionData aoSubscription = createSubscription(aoProduct, aoTerm, aoPriceList);
-            DateTime afterAOCreation = clock.getUTCNow();
+            final DateTime afterAOCreation = clock.getUTCNow();
 
             // CHECK EVERYTHING
             Plan aoCurrentPlan = aoSubscription.getCurrentPlan();
             assertNotNull(aoCurrentPlan);
-            assertEquals(aoCurrentPlan.getProduct().getName(),aoProduct);
+            assertEquals(aoCurrentPlan.getProduct().getName(), aoProduct);
             assertEquals(aoCurrentPlan.getProduct().getCategory(), ProductCategory.ADD_ON);
             assertEquals(aoCurrentPlan.getBillingPeriod(), aoTerm);
 
@@ -410,7 +410,7 @@ public class TestUserApiAddOn extends TestApiBase {
 
             aoCurrentPlan = aoSubscription.getCurrentPlan();
             assertNotNull(aoCurrentPlan);
-            assertEquals(aoCurrentPlan.getProduct().getName(),aoProduct);
+            assertEquals(aoCurrentPlan.getProduct().getName(), aoProduct);
             assertEquals(aoCurrentPlan.getProduct().getCategory(), ProductCategory.ADD_ON);
             assertEquals(aoCurrentPlan.getBillingPeriod(), aoTerm);
 

diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiCancel.java b/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiCancel.java
index 7fb06e0..afebb34 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiCancel.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiCancel.java
@@ -16,11 +16,6 @@
 
 package com.ning.billing.entitlement.api.user;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 import org.testng.Assert;
@@ -36,6 +31,11 @@ import com.ning.billing.entitlement.api.TestApiBase;
 import com.ning.billing.entitlement.api.billing.EntitlementBillingApiException;
 import com.ning.billing.util.clock.DefaultClock;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+
 public abstract class TestUserApiCancel extends TestApiBase {
 
     protected void testCancelSubscriptionIMM() {
@@ -44,22 +44,22 @@ public abstract class TestUserApiCancel extends TestApiBase {
 
         try {
 
-            DateTime init = clock.getUTCNow();
+            final DateTime init = clock.getUTCNow();
 
-            String prod = "Shotgun";
-            BillingPeriod term = BillingPeriod.MONTHLY;
-            String planSet = PriceListSet.DEFAULT_PRICELIST_NAME;
+            final String prod = "Shotgun";
+            final BillingPeriod term = BillingPeriod.MONTHLY;
+            final String planSet = PriceListSet.DEFAULT_PRICELIST_NAME;
 
             // CREATE
-            SubscriptionData subscription = createSubscription(prod, term, planSet);
+            final SubscriptionData subscription = createSubscription(prod, term, planSet);
             PlanPhase currentPhase = subscription.getCurrentPhase();
             assertEquals(currentPhase.getPhaseType(), PhaseType.TRIAL);
 
             // ADVANCE TIME still in trial
-            Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(3));
+            final Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(3));
             clock.addDeltaFromReality(it.toDurationMillis());
 
-            DateTime future = clock.getUTCNow();
+            final DateTime future = clock.getUTCNow();
             testListener.pushExpectedEvent(NextEvent.CANCEL);
 
             // CANCEL in trial period to get IMM policy
@@ -82,9 +82,9 @@ public abstract class TestUserApiCancel extends TestApiBase {
 
         try {
 
-            String prod = "Shotgun";
-            BillingPeriod term = BillingPeriod.MONTHLY;
-            String planSet = PriceListSet.DEFAULT_PRICELIST_NAME;
+            final String prod = "Shotgun";
+            final BillingPeriod term = BillingPeriod.MONTHLY;
+            final String planSet = PriceListSet.DEFAULT_PRICELIST_NAME;
 
             // CREATE
             SubscriptionData subscription = createSubscription(prod, term, planSet);
@@ -92,7 +92,7 @@ public abstract class TestUserApiCancel extends TestApiBase {
             assertEquals(trialPhase.getPhaseType(), PhaseType.TRIAL);
 
             // NEXT PHASE
-            DateTime expectedPhaseTrialChange = DefaultClock.addDuration(subscription.getStartDate(), trialPhase.getDuration());
+            final DateTime expectedPhaseTrialChange = DefaultClock.addDuration(subscription.getStartDate(), trialPhase.getDuration());
             checkNextPhaseChange(subscription, 1, expectedPhaseTrialChange);
 
             // MOVE TO NEXT PHASE
@@ -105,8 +105,8 @@ public abstract class TestUserApiCancel extends TestApiBase {
             assertEquals(trialPhase.getPhaseType(), PhaseType.EVERGREEN);
 
             // SET CTD + RE READ SUBSCRIPTION + CHANGE PLAN
-            Duration ctd = getDurationMonth(1);
-            DateTime newChargedThroughDate = DefaultClock.addDuration(expectedPhaseTrialChange, ctd);
+            final Duration ctd = getDurationMonth(1);
+            final DateTime newChargedThroughDate = DefaultClock.addDuration(expectedPhaseTrialChange, ctd);
             billingApi.setChargedThroughDate(subscription.getId(), newChargedThroughDate, context);
             subscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(subscription.getId());
 
@@ -121,10 +121,10 @@ public abstract class TestUserApiCancel extends TestApiBase {
             testListener.pushExpectedEvent(NextEvent.CANCEL);
             it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusMonths(1));
             clock.addDeltaFromReality(it.toDurationMillis());
-            DateTime future = clock.getUTCNow();
+            final DateTime future = clock.getUTCNow();
             assertTrue(testListener.isCompleted(5000));
 
-            PlanPhase currentPhase = subscription.getCurrentPhase();
+            final PlanPhase currentPhase = subscription.getCurrentPhase();
             assertNull(currentPhase);
             checkNextPhaseChange(subscription, 0, null);
 
@@ -141,23 +141,23 @@ public abstract class TestUserApiCancel extends TestApiBase {
 
         try {
 
-            String prod = "Shotgun";
-            BillingPeriod term = BillingPeriod.MONTHLY;
-            String planSet = PriceListSet.DEFAULT_PRICELIST_NAME;
+            final String prod = "Shotgun";
+            final BillingPeriod term = BillingPeriod.MONTHLY;
+            final String planSet = PriceListSet.DEFAULT_PRICELIST_NAME;
 
             // CREATE
-            SubscriptionData subscription = createSubscription(prod, term, planSet);
+            final SubscriptionData subscription = createSubscription(prod, term, planSet);
             PlanPhase trialPhase = subscription.getCurrentPhase();
             assertEquals(trialPhase.getPhaseType(), PhaseType.TRIAL);
 
             // NEXT PHASE
-            DateTime expectedPhaseTrialChange = DefaultClock.addDuration(subscription.getStartDate(), trialPhase.getDuration());
+            final DateTime expectedPhaseTrialChange = DefaultClock.addDuration(subscription.getStartDate(), trialPhase.getDuration());
             checkNextPhaseChange(subscription, 1, expectedPhaseTrialChange);
 
             // MOVE TO NEXT PHASE
             testListener.pushExpectedEvent(NextEvent.PHASE);
-            
-            Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(31));
+
+            final Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(31));
             clock.addDeltaFromReality(it.toDurationMillis());
             assertTrue(testListener.isCompleted(5000));
             trialPhase = subscription.getCurrentPhase();
@@ -169,7 +169,7 @@ public abstract class TestUserApiCancel extends TestApiBase {
             subscription.cancel(clock.getUTCNow(), false, context);
             assertTrue(testListener.isCompleted(5000));
 
-            PlanPhase currentPhase = subscription.getCurrentPhase();
+            final PlanPhase currentPhase = subscription.getCurrentPhase();
             assertNull(currentPhase);
             checkNextPhaseChange(subscription, 0, null);
 
@@ -188,17 +188,17 @@ public abstract class TestUserApiCancel extends TestApiBase {
 
         try {
 
-            String prod = "Shotgun";
-            BillingPeriod term = BillingPeriod.MONTHLY;
-            String planSet = PriceListSet.DEFAULT_PRICELIST_NAME;
+            final String prod = "Shotgun";
+            final BillingPeriod term = BillingPeriod.MONTHLY;
+            final String planSet = PriceListSet.DEFAULT_PRICELIST_NAME;
 
             // CREATE
             SubscriptionData subscription = createSubscription(prod, term, planSet);
-            PlanPhase trialPhase = subscription.getCurrentPhase();
+            final PlanPhase trialPhase = subscription.getCurrentPhase();
             assertEquals(trialPhase.getPhaseType(), PhaseType.TRIAL);
 
             // NEXT PHASE
-            DateTime expectedPhaseTrialChange = DefaultClock.addDuration(subscription.getStartDate(), trialPhase.getDuration());
+            final DateTime expectedPhaseTrialChange = DefaultClock.addDuration(subscription.getStartDate(), trialPhase.getDuration());
             checkNextPhaseChange(subscription, 1, expectedPhaseTrialChange);
 
             // MOVE TO NEXT PHASE
@@ -210,8 +210,8 @@ public abstract class TestUserApiCancel extends TestApiBase {
             assertEquals(currentPhase.getPhaseType(), PhaseType.EVERGREEN);
 
             // SET CTD + RE READ SUBSCRIPTION + CHANGE PLAN
-            Duration ctd = getDurationMonth(1);
-            DateTime newChargedThroughDate = DefaultClock.addDuration(expectedPhaseTrialChange, ctd);
+            final Duration ctd = getDurationMonth(1);
+            final DateTime newChargedThroughDate = DefaultClock.addDuration(expectedPhaseTrialChange, ctd);
             billingApi.setChargedThroughDate(subscription.getId(), newChargedThroughDate, context);
             subscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(subscription.getId());
 
@@ -219,14 +219,14 @@ public abstract class TestUserApiCancel extends TestApiBase {
             subscription.cancel(clock.getUTCNow(), false, context);
 
             subscription.uncancel(context);
-            
+
             // MOVE TO EOT + RECHECK
-            testListener.pushExpectedEvent(NextEvent.UNCANCEL);            
+            testListener.pushExpectedEvent(NextEvent.UNCANCEL);
             it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusMonths(1));
             clock.addDeltaFromReality(it.toDurationMillis());
             assertTrue(testListener.isCompleted(5000));
 
-            Plan currentPlan = subscription.getCurrentPlan();
+            final Plan currentPlan = subscription.getCurrentPlan();
             assertEquals(currentPlan.getProduct().getName(), prod);
             currentPhase = subscription.getCurrentPhase();
             assertEquals(currentPhase.getPhaseType(), PhaseType.EVERGREEN);

diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiCancelMemory.java b/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiCancelMemory.java
index 625002a..4b3f54a 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiCancelMemory.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiCancelMemory.java
@@ -33,25 +33,25 @@ public class TestUserApiCancelMemory extends TestUserApiCancel {
     }
 
     @Override
-    @Test(enabled=true, groups={"fast"})
+    @Test(enabled = true, groups = {"fast"})
     public void testCancelSubscriptionIMM() {
         super.testCancelSubscriptionIMM();
     }
 
     @Override
-    @Test(enabled=true, groups={"fast"})
+    @Test(enabled = true, groups = {"fast"})
     public void testCancelSubscriptionEOTWithChargeThroughDate() throws EntitlementBillingApiException {
         super.testCancelSubscriptionEOTWithChargeThroughDate();
     }
 
     @Override
-    @Test(enabled=true, groups={"fast"})
+    @Test(enabled = true, groups = {"fast"})
     public void testCancelSubscriptionEOTWithNoChargeThroughDate() {
         super.testCancelSubscriptionEOTWithNoChargeThroughDate();
     }
 
     @Override
-    @Test(enabled=true, groups={"fast"})
+    @Test(enabled = true, groups = {"fast"})
     public void testUncancel() throws EntitlementBillingApiException {
         super.testUncancel();
     }

diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiCancelSql.java b/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiCancelSql.java
index 6d02736..2bd3299 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiCancelSql.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiCancelSql.java
@@ -27,15 +27,14 @@ import com.ning.billing.entitlement.glue.MockEngineModuleSql;
 public class TestUserApiCancelSql extends TestUserApiCancel {
 
 
-    private final int MAX_STRESS_ITERATIONS = 10;
-
     @Override
     public Injector getInjector() {
         return Guice.createInjector(Stage.DEVELOPMENT, new MockEngineModuleSql());
     }
 
-    @Test(enabled= false, groups={"stress"})
+    @Test(enabled = false, groups = {"stress"})
     public void stressTest() throws Exception {
+        final int MAX_STRESS_ITERATIONS = 10;
         for (int i = 0; i < MAX_STRESS_ITERATIONS; i++) {
             cleanupTest();
             setupTest();
@@ -50,25 +49,25 @@ public class TestUserApiCancelSql extends TestUserApiCancel {
     }
 
     @Override
-    @Test(enabled=true, groups={"slow"})
+    @Test(enabled = true, groups = {"slow"})
     public void testCancelSubscriptionIMM() {
         super.testCancelSubscriptionIMM();
     }
 
     @Override
-    @Test(enabled=true, groups={"slow"})
+    @Test(enabled = true, groups = {"slow"})
     public void testCancelSubscriptionEOTWithChargeThroughDate() throws EntitlementBillingApiException {
         super.testCancelSubscriptionEOTWithChargeThroughDate();
     }
 
     @Override
-    @Test(enabled=true, groups={"slow"})
+    @Test(enabled = true, groups = {"slow"})
     public void testCancelSubscriptionEOTWithNoChargeThroughDate() {
         super.testCancelSubscriptionEOTWithNoChargeThroughDate();
     }
 
     @Override
-    @Test(enabled=true, groups={"slow"})
+    @Test(enabled = true, groups = {"slow"})
     public void testUncancel() throws EntitlementBillingApiException {
         super.testUncancel();
     }

diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiChangePlan.java b/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiChangePlan.java
index b1d2c0b..5591238 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiChangePlan.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiChangePlan.java
@@ -16,11 +16,6 @@
 
 package com.ning.billing.entitlement.api.user;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -42,50 +37,53 @@ import com.ning.billing.entitlement.events.EntitlementEvent;
 import com.ning.billing.entitlement.events.user.ApiEvent;
 import com.ning.billing.util.clock.DefaultClock;
 
-public abstract class TestUserApiChangePlan extends TestApiBase {
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
 
+public abstract class TestUserApiChangePlan extends TestApiBase {
 
 
-    private void checkChangePlan(SubscriptionData subscription, String expProduct, ProductCategory expCategory,
-            BillingPeriod expBillingPeriod, PhaseType expPhase) {
+    private void checkChangePlan(final SubscriptionData subscription, final String expProduct, final ProductCategory expCategory,
+                                 final BillingPeriod expBillingPeriod, final PhaseType expPhase) {
 
-        Plan currentPlan = subscription.getCurrentPlan();
+        final Plan currentPlan = subscription.getCurrentPlan();
         assertNotNull(currentPlan);
-        assertEquals(currentPlan.getProduct().getName(),expProduct);
+        assertEquals(currentPlan.getProduct().getName(), expProduct);
         assertEquals(currentPlan.getProduct().getCategory(), expCategory);
         assertEquals(currentPlan.getBillingPeriod(), expBillingPeriod);
 
-        PlanPhase currentPhase = subscription.getCurrentPhase();
+        final PlanPhase currentPhase = subscription.getCurrentPhase();
         assertNotNull(currentPhase);
         assertEquals(currentPhase.getPhaseType(), expPhase);
     }
 
 
-
     protected void testChangePlanBundleAlignEOTWithNoChargeThroughDate() {
         tChangePlanBundleAlignEOTWithNoChargeThroughDate("Shotgun", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, "Pistol", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME);
     }
 
 
-    private void tChangePlanBundleAlignEOTWithNoChargeThroughDate(String fromProd, BillingPeriod fromTerm, String fromPlanSet,
-        String toProd, BillingPeriod toTerm, String toPlanSet) {
+    private void tChangePlanBundleAlignEOTWithNoChargeThroughDate(final String fromProd, final BillingPeriod fromTerm, final String fromPlanSet,
+                                                                  final String toProd, final BillingPeriod toTerm, final String toPlanSet) {
 
         log.info("Starting testChangePlanBundleAlignEOTWithNoChargeThroughDate");
 
         try {
 
             // CREATE
-            SubscriptionData subscription = createSubscription(fromProd, fromTerm, fromPlanSet);
+            final SubscriptionData subscription = createSubscription(fromProd, fromTerm, fromPlanSet);
 
             // MOVE TO NEXT PHASE
             PlanPhase currentPhase = subscription.getCurrentPhase();
             testListener.pushExpectedEvent(NextEvent.PHASE);
-            
-            Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(31));
+
+            final Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(31));
             clock.addDeltaFromReality(it.toDurationMillis());
 
-            DateTime futureNow = clock.getUTCNow();
-            DateTime nextExpectedPhaseChange = DefaultClock.addDuration(subscription.getStartDate(), currentPhase.getDuration());
+            final DateTime futureNow = clock.getUTCNow();
+            final DateTime nextExpectedPhaseChange = DefaultClock.addDuration(subscription.getStartDate(), currentPhase.getDuration());
             assertTrue(futureNow.isAfter(nextExpectedPhaseChange));
             assertTrue(testListener.isCompleted(5000));
 
@@ -110,16 +108,16 @@ public abstract class TestUserApiChangePlan extends TestApiBase {
         testChangePlanBundleAlignEOTWithChargeThroughDate("Shotgun", BillingPeriod.ANNUAL, "gunclubDiscount", "Pistol", BillingPeriod.ANNUAL, "gunclubDiscount");
     }
 
-    private void testChangePlanBundleAlignEOTWithChargeThroughDate(String fromProd, BillingPeriod fromTerm, String fromPlanSet,
-            String toProd, BillingPeriod toTerm, String toPlanSet) throws EntitlementBillingApiException {
+    private void testChangePlanBundleAlignEOTWithChargeThroughDate(final String fromProd, final BillingPeriod fromTerm, final String fromPlanSet,
+                                                                   final String toProd, final BillingPeriod toTerm, final String toPlanSet) throws EntitlementBillingApiException {
+
 
-        
         try {
 
             // CREATE
             SubscriptionData subscription = createSubscription(fromProd, fromTerm, fromPlanSet);
-            PlanPhase trialPhase = subscription.getCurrentPhase();
-            DateTime expectedPhaseTrialChange = DefaultClock.addDuration(subscription.getStartDate(), trialPhase.getDuration());
+            final PlanPhase trialPhase = subscription.getCurrentPhase();
+            final DateTime expectedPhaseTrialChange = DefaultClock.addDuration(subscription.getStartDate(), trialPhase.getDuration());
             assertEquals(trialPhase.getPhaseType(), PhaseType.TRIAL);
 
 
@@ -133,8 +131,8 @@ public abstract class TestUserApiChangePlan extends TestApiBase {
 
 
             // SET CTD
-            Duration ctd = getDurationMonth(1);
-            DateTime newChargedThroughDate = DefaultClock.addDuration(expectedPhaseTrialChange, ctd);
+            final Duration ctd = getDurationMonth(1);
+            final DateTime newChargedThroughDate = DefaultClock.addDuration(expectedPhaseTrialChange, ctd);
             billingApi.setChargedThroughDate(subscription.getId(), newChargedThroughDate, context);
 
             // RE READ SUBSCRIPTION + CHANGE PLAN
@@ -150,11 +148,11 @@ public abstract class TestUserApiChangePlan extends TestApiBase {
             checkChangePlan(subscription, fromProd, ProductCategory.BASE, fromTerm, PhaseType.DISCOUNT);
 
             // NEXT PHASE
-            DateTime nextExpectedPhaseChange = DefaultClock.addDuration(expectedPhaseTrialChange, currentPhase.getDuration());
+            final DateTime nextExpectedPhaseChange = DefaultClock.addDuration(expectedPhaseTrialChange, currentPhase.getDuration());
             checkNextPhaseChange(subscription, 2, nextExpectedPhaseChange);
 
             // ALSO VERIFY PENDING CHANGE EVENT
-            List<EntitlementEvent> events = dao.getPendingEventsForSubscription(subscription.getId());
+            final List<EntitlementEvent> events = dao.getPendingEventsForSubscription(subscription.getId());
             assertTrue(events.get(0) instanceof ApiEvent);
 
 
@@ -180,14 +178,14 @@ public abstract class TestUserApiChangePlan extends TestApiBase {
     }
 
 
-    private void tChangePlanBundleAlignIMM(String fromProd, BillingPeriod fromTerm, String fromPlanSet,
-            String toProd, BillingPeriod toTerm, String toPlanSet) {
+    private void tChangePlanBundleAlignIMM(final String fromProd, final BillingPeriod fromTerm, final String fromPlanSet,
+                                           final String toProd, final BillingPeriod toTerm, final String toPlanSet) {
 
         log.info("Starting testChangePlanBundleAlignIMM");
 
         try {
 
-            SubscriptionData subscription = createSubscription(fromProd, fromTerm, fromPlanSet);
+            final SubscriptionData subscription = createSubscription(fromProd, fromTerm, fromPlanSet);
 
             testListener.pushExpectedEvent(NextEvent.CHANGE);
 
@@ -200,15 +198,15 @@ public abstract class TestUserApiChangePlan extends TestApiBase {
 
             assertTrue(testListener.isCompleted(5000));
 
-            PlanPhase currentPhase = subscription.getCurrentPhase();
-            DateTime nextExpectedPhaseChange = DefaultClock.addDuration(subscription.getStartDate(), currentPhase.getDuration());
+            final PlanPhase currentPhase = subscription.getCurrentPhase();
+            final DateTime nextExpectedPhaseChange = DefaultClock.addDuration(subscription.getStartDate(), currentPhase.getDuration());
             checkNextPhaseChange(subscription, 1, nextExpectedPhaseChange);
 
             // NEXT PHASE
             testListener.pushExpectedEvent(NextEvent.PHASE);
             it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(30));
             clock.addDeltaFromReality(it.toDurationMillis());
-            DateTime futureNow = clock.getUTCNow();
+            final DateTime futureNow = clock.getUTCNow();
 
             assertTrue(futureNow.isAfter(nextExpectedPhaseChange));
             assertTrue(testListener.isCompleted(5000));
@@ -225,16 +223,16 @@ public abstract class TestUserApiChangePlan extends TestApiBase {
         tChangePlanChangePlanAlignEOTWithChargeThroughDate("Shotgun", BillingPeriod.ANNUAL, PriceListSet.DEFAULT_PRICELIST_NAME, "Assault-Rifle", BillingPeriod.ANNUAL, "rescue");
     }
 
-    private void tChangePlanChangePlanAlignEOTWithChargeThroughDate(String fromProd, BillingPeriod fromTerm, String fromPlanSet,
-            String toProd, BillingPeriod toTerm, String toPlanSet) throws EntitlementBillingApiException {
+    private void tChangePlanChangePlanAlignEOTWithChargeThroughDate(final String fromProd, final BillingPeriod fromTerm, final String fromPlanSet,
+                                                                    final String toProd, final BillingPeriod toTerm, final String toPlanSet) throws EntitlementBillingApiException {
 
         try {
 
             DateTime currentTime = clock.getUTCNow();
 
             SubscriptionData subscription = createSubscription(fromProd, fromTerm, fromPlanSet);
-            PlanPhase trialPhase = subscription.getCurrentPhase();
-            DateTime expectedPhaseTrialChange = DefaultClock.addDuration(subscription.getStartDate(), trialPhase.getDuration());
+            final PlanPhase trialPhase = subscription.getCurrentPhase();
+            final DateTime expectedPhaseTrialChange = DefaultClock.addDuration(subscription.getStartDate(), trialPhase.getDuration());
             assertEquals(trialPhase.getPhaseType(), PhaseType.TRIAL);
 
             // MOVE TO NEXT PHASE
@@ -246,8 +244,8 @@ public abstract class TestUserApiChangePlan extends TestApiBase {
             assertTrue(testListener.isCompleted(5000));
 
             // SET CTD
-            Duration ctd = getDurationMonth(1);
-            DateTime newChargedThroughDate = DefaultClock.addDuration(expectedPhaseTrialChange, ctd);
+            final Duration ctd = getDurationMonth(1);
+            final DateTime newChargedThroughDate = DefaultClock.addDuration(expectedPhaseTrialChange, ctd);
             billingApi.setChargedThroughDate(subscription.getId(), newChargedThroughDate, context);
 
             // RE READ SUBSCRIPTION + CHECK CURRENT PHASE
@@ -276,7 +274,7 @@ public abstract class TestUserApiChangePlan extends TestApiBase {
             assertTrue(testListener.isCompleted(5000));
 
             // CHECK CORRECT PRODUCT, PHASE, PLAN SET
-            String currentProduct =  subscription.getCurrentPlan().getProduct().getName();
+            final String currentProduct = subscription.getCurrentPlan().getProduct().getName();
             assertNotNull(currentProduct);
             assertEquals(currentProduct, toProd);
             currentPhase = subscription.getCurrentPhase();
@@ -292,7 +290,7 @@ public abstract class TestUserApiChangePlan extends TestApiBase {
             assertFalse(testListener.isCompleted(3000));
             testListener.reset();
 
-            DateTime nextExpectedPhaseChange = DefaultClock.addDuration(newChargedThroughDate, currentPhase.getDuration());
+            final DateTime nextExpectedPhaseChange = DefaultClock.addDuration(newChargedThroughDate, currentPhase.getDuration());
             checkNextPhaseChange(subscription, 1, nextExpectedPhaseChange);
 
             // MOVE TIME RIGHT AFTER NEXT EXPECTED PHASE CHANGE
@@ -314,23 +312,23 @@ public abstract class TestUserApiChangePlan extends TestApiBase {
         log.info("Starting testMultipleChangeLastIMM");
         try {
             SubscriptionData subscription = createSubscription("Assault-Rifle", BillingPeriod.MONTHLY, "gunclubDiscount");
-            PlanPhase trialPhase = subscription.getCurrentPhase();
+            final PlanPhase trialPhase = subscription.getCurrentPhase();
             assertEquals(trialPhase.getPhaseType(), PhaseType.TRIAL);
 
             // MOVE TO NEXT PHASE
             testListener.pushExpectedEvent(NextEvent.PHASE);
-            Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(31));
+            final Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(31));
             clock.addDeltaFromReality(it.toDurationMillis());
 
             assertTrue(testListener.isCompleted(5000));
 
             // SET CTD
-            List<Duration> durationList = new ArrayList<Duration>();
+            final List<Duration> durationList = new ArrayList<Duration>();
             durationList.add(trialPhase.getDuration());
             //durationList.add(subscription.getCurrentPhase().getDuration());
-            DateTime startDiscountPhase = DefaultClock.addDuration(subscription.getStartDate(), durationList);
-            Duration ctd = getDurationMonth(1);
-            DateTime newChargedThroughDate = DefaultClock.addDuration(startDiscountPhase, ctd);
+            final DateTime startDiscountPhase = DefaultClock.addDuration(subscription.getStartDate(), durationList);
+            final Duration ctd = getDurationMonth(1);
+            final DateTime newChargedThroughDate = DefaultClock.addDuration(startDiscountPhase, ctd);
             billingApi.setChargedThroughDate(subscription.getId(), newChargedThroughDate, context);
             subscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(subscription.getId());
 
@@ -346,16 +344,16 @@ public abstract class TestUserApiChangePlan extends TestApiBase {
             subscription.changePlan("Assault-Rifle", BillingPeriod.ANNUAL, "gunclubDiscount", clock.getUTCNow(), context);
             assertTrue(testListener.isCompleted(5000));
 
-            Plan currentPlan = subscription.getCurrentPlan();
+            final Plan currentPlan = subscription.getCurrentPlan();
             assertNotNull(currentPlan);
             assertEquals(currentPlan.getProduct().getName(), "Assault-Rifle");
             assertEquals(currentPlan.getProduct().getCategory(), ProductCategory.BASE);
             assertEquals(currentPlan.getBillingPeriod(), BillingPeriod.ANNUAL);
 
-            PlanPhase currentPhase = subscription.getCurrentPhase();
+            final PlanPhase currentPhase = subscription.getCurrentPhase();
             assertNotNull(currentPhase);
             assertEquals(currentPhase.getPhaseType(), PhaseType.DISCOUNT);
-            
+
             assertListenerStatus();
         } catch (EntitlementUserApiException e) {
             Assert.fail(e.getMessage());
@@ -368,7 +366,7 @@ public abstract class TestUserApiChangePlan extends TestApiBase {
         try {
 
             SubscriptionData subscription = createSubscription("Assault-Rifle", BillingPeriod.ANNUAL, "gunclubDiscount");
-            PlanPhase trialPhase = subscription.getCurrentPhase();
+            final PlanPhase trialPhase = subscription.getCurrentPhase();
             assertEquals(trialPhase.getPhaseType(), PhaseType.TRIAL);
 
             testListener.pushExpectedEvent(NextEvent.PHASE);
@@ -377,11 +375,11 @@ public abstract class TestUserApiChangePlan extends TestApiBase {
             assertTrue(testListener.isCompleted(5000));
 
             // SET CTD
-            List<Duration> durationList = new ArrayList<Duration>();
+            final List<Duration> durationList = new ArrayList<Duration>();
             durationList.add(trialPhase.getDuration());
-            DateTime startDiscountPhase = DefaultClock.addDuration(subscription.getStartDate(), durationList);
-            Duration ctd = getDurationMonth(1);
-            DateTime newChargedThroughDate = DefaultClock.addDuration(startDiscountPhase, ctd);
+            final DateTime startDiscountPhase = DefaultClock.addDuration(subscription.getStartDate(), durationList);
+            final Duration ctd = getDurationMonth(1);
+            final DateTime newChargedThroughDate = DefaultClock.addDuration(startDiscountPhase, ctd);
             billingApi.setChargedThroughDate(subscription.getId(), newChargedThroughDate, context);
             subscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(subscription.getId());
 
@@ -428,7 +426,6 @@ public abstract class TestUserApiChangePlan extends TestApiBase {
             assertEquals(currentPhase.getPhaseType(), PhaseType.DISCOUNT);
 
 
-
             // MOVE TO NEXT PHASE
             testListener.pushExpectedEvent(NextEvent.PHASE);
             it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusMonths(6));
@@ -454,9 +451,9 @@ public abstract class TestUserApiChangePlan extends TestApiBase {
 
 
     protected void testCorrectPhaseAlignmentOnChange() {
-        
+
         log.info("Starting testCorrectPhaseAlignmentOnChange");
-        
+
         try {
 
             SubscriptionData subscription = createSubscription("Shotgun", BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME);
@@ -466,7 +463,7 @@ public abstract class TestUserApiChangePlan extends TestApiBase {
             // MOVE 2 DAYS AHEAD
             Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(2));
             clock.addDeltaFromReality(it.toDurationMillis());
-    
+
 
             // CHANGE IMMEDIATE TO A 3 PHASES PLAN
             testListener.reset();
@@ -476,7 +473,7 @@ public abstract class TestUserApiChangePlan extends TestApiBase {
             testListener.reset();
 
             // CHECK EVERYTHING LOOKS CORRECT
-            Plan currentPlan = subscription.getCurrentPlan();
+            final Plan currentPlan = subscription.getCurrentPlan();
             assertNotNull(currentPlan);
             assertEquals(currentPlan.getProduct().getName(), "Assault-Rifle");
             assertEquals(currentPlan.getProduct().getCategory(), ProductCategory.BASE);
@@ -497,9 +494,9 @@ public abstract class TestUserApiChangePlan extends TestApiBase {
 
             subscription = (SubscriptionData) entitlementApi.getSubscriptionFromId(subscription.getId());
 
-            DateTime expectedNextPhaseDate =  subscription.getStartDate().plusDays(30).plusMonths(6);
-            SubscriptionEvent nextPhase = subscription.getPendingTransition();
-            DateTime nextPhaseEffectiveDate = nextPhase.getEffectiveTransitionTime();
+            final DateTime expectedNextPhaseDate = subscription.getStartDate().plusDays(30).plusMonths(6);
+            final SubscriptionEvent nextPhase = subscription.getPendingTransition();
+            final DateTime nextPhaseEffectiveDate = nextPhase.getEffectiveTransitionTime();
 
             assertEquals(nextPhaseEffectiveDate, expectedNextPhaseDate);
 

diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiChangePlanMemory.java b/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiChangePlanMemory.java
index 0da1169..6bc6864 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiChangePlanMemory.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiChangePlanMemory.java
@@ -33,38 +33,38 @@ public class TestUserApiChangePlanMemory extends TestUserApiChangePlan {
 
 
     @Override
-    @Test(enabled=true, groups={"fast"})
+    @Test(enabled = true, groups = {"fast"})
     public void testChangePlanBundleAlignEOTWithNoChargeThroughDate() {
-         super.testChangePlanBundleAlignEOTWithNoChargeThroughDate();
+        super.testChangePlanBundleAlignEOTWithNoChargeThroughDate();
     }
 
     @Override
-    @Test(enabled=true, groups={"fast"})
+    @Test(enabled = true, groups = {"fast"})
     public void testChangePlanBundleAlignEOTWithChargeThroughDate() throws EntitlementBillingApiException {
         super.testChangePlanBundleAlignEOTWithChargeThroughDate();
     }
 
     @Override
-    @Test(enabled=true, groups={"fast"})
+    @Test(enabled = true, groups = {"fast"})
     public void testChangePlanBundleAlignIMM() {
         super.testChangePlanBundleAlignIMM();
     }
 
     @Override
-    @Test(enabled=true, groups={"fast"})
+    @Test(enabled = true, groups = {"fast"})
     public void testMultipleChangeLastIMM() throws EntitlementBillingApiException {
         super.testMultipleChangeLastIMM();
     }
 
     @Override
-    @Test(enabled=true, groups={"fast"})
+    @Test(enabled = true, groups = {"fast"})
     public void testMultipleChangeLastEOT() throws EntitlementBillingApiException {
         super.testMultipleChangeLastEOT();
     }
 
 
     @Override
-    @Test(enabled=true, groups={"fast"})
+    @Test(enabled = true, groups = {"fast"})
     public void testCorrectPhaseAlignmentOnChange() {
         super.testCorrectPhaseAlignmentOnChange();
     }

diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiChangePlanSql.java b/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiChangePlanSql.java
index 1039b85..bec359b 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiChangePlanSql.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiChangePlanSql.java
@@ -26,15 +26,14 @@ import com.ning.billing.entitlement.glue.MockEngineModuleSql;
 
 public class TestUserApiChangePlanSql extends TestUserApiChangePlan {
 
-    private final int MAX_STRESS_ITERATIONS = 10;
-
     @Override
     public Injector getInjector() {
         return Guice.createInjector(Stage.DEVELOPMENT, new MockEngineModuleSql());
     }
 
-    @Test(enabled= false, groups={"stress"})
+    @Test(enabled = false, groups = {"stress"})
     public void stressTest() throws Exception {
+        final int MAX_STRESS_ITERATIONS = 10;
         for (int i = 0; i < MAX_STRESS_ITERATIONS; i++) {
             cleanupTest();
             setupTest();
@@ -55,44 +54,44 @@ public class TestUserApiChangePlanSql extends TestUserApiChangePlan {
     }
 
     @Override
-    @Test(enabled=true, groups={"slow"})
+    @Test(enabled = true, groups = {"slow"})
     public void testCorrectPhaseAlignmentOnChange() {
         super.testCorrectPhaseAlignmentOnChange();
     }
 
     @Override
-    @Test(enabled=true, groups={"slow"})
+    @Test(enabled = true, groups = {"slow"})
     public void testChangePlanBundleAlignEOTWithNoChargeThroughDate() {
         super.testChangePlanBundleAlignEOTWithNoChargeThroughDate();
     }
 
     @Override
-    @Test(enabled=true, groups={"slow"})
+    @Test(enabled = true, groups = {"slow"})
     public void testChangePlanBundleAlignEOTWithChargeThroughDate() throws EntitlementBillingApiException {
         super.testChangePlanBundleAlignEOTWithChargeThroughDate();
     }
 
     @Override
-    @Test(enabled=true, groups={"slow"})
+    @Test(enabled = true, groups = {"slow"})
     public void testChangePlanBundleAlignIMM() {
         super.testChangePlanBundleAlignIMM();
     }
 
     @Override
-    @Test(enabled=true, groups={"slow"})
+    @Test(enabled = true, groups = {"slow"})
     public void testMultipleChangeLastIMM() throws EntitlementBillingApiException {
         super.testMultipleChangeLastIMM();
     }
 
     @Override
-    @Test(enabled=true, groups={"slow"})
+    @Test(enabled = true, groups = {"slow"})
     public void testMultipleChangeLastEOT() throws EntitlementBillingApiException {
         super.testMultipleChangeLastEOT();
     }
 
     // rescue not implemented yet
     @Override
-    @Test(enabled=false, groups={"slow"})
+    @Test(enabled = false, groups = {"slow"})
     public void testChangePlanChangePlanAlignEOTWithChargeThroughDate() throws EntitlementBillingApiException {
         super.testChangePlanChangePlanAlignEOTWithChargeThroughDate();
     }

diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiCreate.java b/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiCreate.java
index 6517044..510f55b 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiCreate.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiCreate.java
@@ -17,10 +17,6 @@
 package com.ning.billing.entitlement.api.user;
 
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
 import java.util.List;
 
 import org.joda.time.DateTime;
@@ -41,28 +37,32 @@ import com.ning.billing.entitlement.events.EntitlementEvent;
 import com.ning.billing.entitlement.events.phase.PhaseEvent;
 import com.ning.billing.util.clock.DefaultClock;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
 public abstract class TestUserApiCreate extends TestApiBase {
 
-    private static Logger log = LoggerFactory.getLogger(TestUserApiCreate.class);
+    private static final Logger log = LoggerFactory.getLogger(TestUserApiCreate.class);
 
     public void testCreateWithRequestedDate() {
         log.info("Starting testCreateWithRequestedDate");
         try {
 
-            DateTime init = clock.getUTCNow();
-            DateTime requestedDate = init.minusYears(1);
+            final DateTime init = clock.getUTCNow();
+            final DateTime requestedDate = init.minusYears(1);
 
-            String productName = "Shotgun";
-            BillingPeriod term = BillingPeriod.MONTHLY;
-            String planSetName = PriceListSet.DEFAULT_PRICELIST_NAME;
+            final String productName = "Shotgun";
+            final BillingPeriod term = BillingPeriod.MONTHLY;
+            final String planSetName = PriceListSet.DEFAULT_PRICELIST_NAME;
 
 
             testListener.pushExpectedEvent(NextEvent.PHASE);
             testListener.pushExpectedEvent(NextEvent.CREATE);
 
 
-            SubscriptionData subscription = (SubscriptionData) entitlementApi.createSubscription(bundle.getId(),
-                    getProductSpecifier(productName, planSetName, term, null), requestedDate, context);
+            final SubscriptionData subscription = (SubscriptionData) entitlementApi.createSubscription(bundle.getId(),
+                                                                                                 getProductSpecifier(productName, planSetName, term, null), requestedDate, context);
             assertNotNull(subscription);
 
             assertEquals(subscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
@@ -73,9 +73,9 @@ public abstract class TestUserApiCreate extends TestApiBase {
             assertTrue(testListener.isCompleted(5000));
 
             assertListenerStatus();
-            
+
         } catch (EntitlementUserApiException e) {
-        	log.error("Unexpected exception",e);
+            log.error("Unexpected exception", e);
             Assert.fail(e.getMessage());
         }
     }
@@ -86,16 +86,16 @@ public abstract class TestUserApiCreate extends TestApiBase {
         try {
 
 
-            DateTime init = clock.getUTCNow();
+            final DateTime init = clock.getUTCNow();
 
-            String productName = "Shotgun";
-            BillingPeriod term = BillingPeriod.MONTHLY;
-            String planSetName = PriceListSet.DEFAULT_PRICELIST_NAME;
+            final String productName = "Shotgun";
+            final BillingPeriod term = BillingPeriod.MONTHLY;
+            final String planSetName = PriceListSet.DEFAULT_PRICELIST_NAME;
 
             testListener.pushExpectedEvent(NextEvent.CREATE);
 
-            SubscriptionData subscription = (SubscriptionData) entitlementApi.createSubscription(bundle.getId(),
-                    getProductSpecifier(productName, planSetName, term, PhaseType.EVERGREEN), clock.getUTCNow(), context);
+            final SubscriptionData subscription = (SubscriptionData) entitlementApi.createSubscription(bundle.getId(),
+                                                                                                 getProductSpecifier(productName, planSetName, term, PhaseType.EVERGREEN), clock.getUTCNow(), context);
             assertNotNull(subscription);
 
             assertEquals(subscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
@@ -104,18 +104,18 @@ public abstract class TestUserApiCreate extends TestApiBase {
             assertDateWithin(subscription.getStartDate(), init, clock.getUTCNow());
             assertDateWithin(subscription.getBundleStartDate(), init, clock.getUTCNow());
 
-            Plan currentPlan = subscription.getCurrentPlan();
+            final Plan currentPlan = subscription.getCurrentPlan();
             assertNotNull(currentPlan);
             assertEquals(currentPlan.getProduct().getName(), productName);
             assertEquals(currentPlan.getProduct().getCategory(), ProductCategory.BASE);
             assertEquals(currentPlan.getBillingPeriod(), BillingPeriod.MONTHLY);
 
-            PlanPhase currentPhase = subscription.getCurrentPhase();
+            final PlanPhase currentPhase = subscription.getCurrentPhase();
             assertNotNull(currentPhase);
             assertEquals(currentPhase.getPhaseType(), PhaseType.EVERGREEN);
 
             assertListenerStatus();
-            
+
         } catch (EntitlementUserApiException e) {
             Assert.fail(e.getMessage());
         }
@@ -126,17 +126,17 @@ public abstract class TestUserApiCreate extends TestApiBase {
         log.info("Starting testSimpleCreateSubscription");
         try {
 
-            DateTime init = clock.getUTCNow();
+            final DateTime init = clock.getUTCNow();
 
-            String productName = "Shotgun";
-            BillingPeriod term = BillingPeriod.MONTHLY;
-            String planSetName = PriceListSet.DEFAULT_PRICELIST_NAME;
+            final String productName = "Shotgun";
+            final BillingPeriod term = BillingPeriod.MONTHLY;
+            final String planSetName = PriceListSet.DEFAULT_PRICELIST_NAME;
 
             testListener.pushExpectedEvent(NextEvent.CREATE);
 
-            SubscriptionData subscription = (SubscriptionData) entitlementApi.createSubscription(bundle.getId(),
-                    getProductSpecifier(productName, planSetName, term, null),
-                    clock.getUTCNow(), context);
+            final SubscriptionData subscription = (SubscriptionData) entitlementApi.createSubscription(bundle.getId(),
+                                                                                                 getProductSpecifier(productName, planSetName, term, null),
+                                                                                                 clock.getUTCNow(), context);
             assertNotNull(subscription);
 
             assertEquals(subscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
@@ -145,31 +145,31 @@ public abstract class TestUserApiCreate extends TestApiBase {
             assertDateWithin(subscription.getStartDate(), init, clock.getUTCNow());
             assertDateWithin(subscription.getBundleStartDate(), init, clock.getUTCNow());
 
-            Plan currentPlan = subscription.getCurrentPlan();
+            final Plan currentPlan = subscription.getCurrentPlan();
             assertNotNull(currentPlan);
             assertEquals(currentPlan.getProduct().getName(), productName);
             assertEquals(currentPlan.getProduct().getCategory(), ProductCategory.BASE);
             assertEquals(currentPlan.getBillingPeriod(), BillingPeriod.MONTHLY);
 
-            PlanPhase currentPhase = subscription.getCurrentPhase();
+            final PlanPhase currentPhase = subscription.getCurrentPhase();
             assertNotNull(currentPhase);
             assertEquals(currentPhase.getPhaseType(), PhaseType.TRIAL);
             assertTrue(testListener.isCompleted(5000));
 
-            List<EntitlementEvent> events = dao.getPendingEventsForSubscription(subscription.getId());
+            final List<EntitlementEvent> events = dao.getPendingEventsForSubscription(subscription.getId());
             assertNotNull(events);
             printEvents(events);
             assertTrue(events.size() == 1);
             assertTrue(events.get(0) instanceof PhaseEvent);
-            DateTime nextPhaseChange = ((PhaseEvent ) events.get(0)).getEffectiveDate();
-            DateTime nextExpectedPhaseChange = DefaultClock.addDuration(subscription.getStartDate(), currentPhase.getDuration());
+            final DateTime nextPhaseChange = ((PhaseEvent) events.get(0)).getEffectiveDate();
+            final DateTime nextExpectedPhaseChange = DefaultClock.addDuration(subscription.getStartDate(), currentPhase.getDuration());
             assertEquals(nextPhaseChange, nextExpectedPhaseChange);
 
             testListener.pushExpectedEvent(NextEvent.PHASE);
-            Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(31));
+            final Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(31));
             clock.addDeltaFromReality(it.toDurationMillis());
 
-            DateTime futureNow = clock.getUTCNow();
+            final DateTime futureNow = clock.getUTCNow();
             assertTrue(futureNow.isAfter(nextPhaseChange));
 
             assertTrue(testListener.isCompleted(5000));
@@ -186,15 +186,15 @@ public abstract class TestUserApiCreate extends TestApiBase {
         log.info("Starting testSimpleSubscriptionThroughPhases");
         try {
 
-            String productName = "Pistol";
-            BillingPeriod term = BillingPeriod.ANNUAL;
-            String planSetName = "gunclubDiscount";
+            final String productName = "Pistol";
+            final BillingPeriod term = BillingPeriod.ANNUAL;
+            final String planSetName = "gunclubDiscount";
 
             testListener.pushExpectedEvent(NextEvent.CREATE);
 
             // CREATE SUBSCRIPTION
             SubscriptionData subscription = (SubscriptionData) entitlementApi.createSubscription(bundle.getId(),
-                    getProductSpecifier(productName, planSetName, term, null), clock.getUTCNow(), context);
+                                                                                                 getProductSpecifier(productName, planSetName, term, null), clock.getUTCNow(), context);
             assertNotNull(subscription);
 
             PlanPhase currentPhase = subscription.getCurrentPhase();
@@ -210,7 +210,7 @@ public abstract class TestUserApiCreate extends TestApiBase {
             currentPhase = subscription.getCurrentPhase();
             assertNotNull(currentPhase);
             assertEquals(currentPhase.getPhaseType(), PhaseType.DISCOUNT);
-            
+
 
             // MOVE TO EVERGREEN PHASE + RE-READ SUBSCRIPTION
             testListener.pushExpectedEvent(NextEvent.PHASE);
@@ -234,14 +234,14 @@ public abstract class TestUserApiCreate extends TestApiBase {
         log.info("Starting testSubscriptionWithAddOn");
         try {
 
-            String productName = "Shotgun";
-            BillingPeriod term = BillingPeriod.ANNUAL;
-            String planSetName = PriceListSet.DEFAULT_PRICELIST_NAME;
+            final String productName = "Shotgun";
+            final BillingPeriod term = BillingPeriod.ANNUAL;
+            final String planSetName = PriceListSet.DEFAULT_PRICELIST_NAME;
 
             testListener.pushExpectedEvent(NextEvent.CREATE);
 
-            SubscriptionData subscription = (SubscriptionData) entitlementApi.createSubscription(bundle.getId(),
-                    getProductSpecifier(productName, planSetName, term, null), clock.getUTCNow(), context);
+            final SubscriptionData subscription = (SubscriptionData) entitlementApi.createSubscription(bundle.getId(),
+                                                                                                 getProductSpecifier(productName, planSetName, term, null), clock.getUTCNow(), context);
             assertNotNull(subscription);
 
             assertListenerStatus();