diff --git a/source/org/jivesoftware/smack/util/DateFormatType.java b/source/org/jivesoftware/smack/util/DateFormatType.java
index a9d563da9..8e0ae8a36 100644
--- a/source/org/jivesoftware/smack/util/DateFormatType.java
+++ b/source/org/jivesoftware/smack/util/DateFormatType.java
@@ -17,48 +17,49 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smack.util;
-
-import java.text.SimpleDateFormat;
-
-/**
- * Defines the various date and time profiles used in XMPP along with their associated formats.
- * @author Robin Collier
- *
- */
-public enum DateFormatType
-{
-	XEP_0082_DATE_PROFILE("yyyy-MM-dd"), 
-	XEP_0082_DATETIME_PROFILE("yyyy-MM-dd'T'HH:mm:ssZ"),
-	XEP_0082_DATETIME_MILLIS_PROFILE("yyyy-MM-dd'T'HH:mm:ss.SSSZ"),
-	XEP_0082_TIME_PROFILE("hh:mm:ss"), 
-	XEP_0082_TIME_ZONE_PROFILE("hh:mm:ssZ"), 
-	XEP_0082_TIME_MILLIS_PROFILE("hh:mm:ss.SSS"), 
-	XEP_0082_TIME_MILLIS_ZONE_PROFILE("hh:mm:ss.SSSZ"),
-	XEP_0091_DATETIME("yyyyMMdd'T'HH:mm:ss");
-	
-	private String formatString;
-	
-	private DateFormatType(String dateFormat)
-	{
-		formatString = dateFormat;
-	}
-	
-	/**
-	 * Get the format string as defined in either XEP-0082 or XEP-0091.
-	 * @return The defined string format for the date.
-	 */
-	public String getFormatString()
-	{
-		return formatString;
-	}
-	
-	/**
-	 * Create a {@link SimpleDateFormat} object with the format defined by {@link #getFormatString()}.
-	 * @return A new date formatter.
-	 */
-	public SimpleDateFormat createFormatter()
-	{
-		return new SimpleDateFormat(getFormatString());
-	}
-}
+package org.jivesoftware.smack.util;
+
+import java.text.SimpleDateFormat;
+
+/**
+ * Defines the various date and time profiles used in XMPP along with their associated formats.
+ * 
+ * @author Robin Collier
+ * 
+ */
+public enum DateFormatType {
+    // @formatter:off
+    XEP_0082_DATE_PROFILE("yyyy-MM-dd"), 
+    XEP_0082_DATETIME_PROFILE("yyyy-MM-dd'T'HH:mm:ssZ"), 
+    XEP_0082_DATETIME_MILLIS_PROFILE("yyyy-MM-dd'T'HH:mm:ss.SSSZ"), 
+    XEP_0082_TIME_PROFILE("hh:mm:ss"), 
+    XEP_0082_TIME_ZONE_PROFILE("hh:mm:ssZ"), 
+    XEP_0082_TIME_MILLIS_PROFILE("hh:mm:ss.SSS"), 
+    XEP_0082_TIME_MILLIS_ZONE_PROFILE("hh:mm:ss.SSSZ"), 
+    XEP_0091_DATETIME("yyyyMMdd'T'HH:mm:ss");
+    // @formatter:on
+
+    private String formatString;
+
+    private DateFormatType(String dateFormat) {
+        formatString = dateFormat;
+    }
+
+    /**
+     * Get the format string as defined in either XEP-0082 or XEP-0091.
+     * 
+     * @return The defined string format for the date.
+     */
+    public String getFormatString() {
+        return formatString;
+    }
+
+    /**
+     * Create a {@link SimpleDateFormat} object with the format defined by {@link #getFormatString()}.
+     * 
+     * @return A new date formatter.
+     */
+    public SimpleDateFormat createFormatter() {
+        return new SimpleDateFormat(getFormatString());
+    }
+}
diff --git a/test-unit/org/jivesoftware/smack/TestUtils.java b/test-unit/org/jivesoftware/smack/TestUtils.java
index f9dfcd6a8..0eae51e35 100644
--- a/test-unit/org/jivesoftware/smack/TestUtils.java
+++ b/test-unit/org/jivesoftware/smack/TestUtils.java
@@ -3,7 +3,7 @@
  * $Revision$
  * $Date$
  *
- * Copyright 2003-2007 Jive Software.
+ * Copyright 2013 Robin Collier
  *
  * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,61 +17,52 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smack;
-
-import java.io.IOException;
-import java.io.StringReader;
-
-import org.xmlpull.mxp1.MXParser;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-final public class TestUtils
-{
-	private TestUtils() {}
-	
-	public static XmlPullParser getIQParser(String stanza)
-	{
-		return getParser(stanza, "iq");
-	}
-
-	public static XmlPullParser getMessageParser(String stanza)
-	{
-		return getParser(stanza, "message");
-	}
-
-	public static XmlPullParser getPresenceParser(String stanza)
-	{
-		return getParser(stanza, "presence");
-	}
-	
-	public static XmlPullParser getParser(String stanza, String startTag)
-	{
-		XmlPullParser parser = new MXParser();
-		try
-		{
-            parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
-			parser.setInput(new StringReader(stanza));
-			boolean found = false;
-
-			while (!found)
-			{
-				if ((parser.next() == XmlPullParser.START_TAG) && parser.getName().equals(startTag))
-					found = true;
-			}
-			
-			if (!found)
-				throw new IllegalArgumentException("Cannot parse start tag [" + startTag + "] from stanze [" + stanza + "]");
-		}
-		catch (XmlPullParserException e)
-		{
-			throw new RuntimeException(e);
-		}
-		catch (IOException e)
-		{
-			throw new RuntimeException(e);
-		}
-		return parser;
-	}
-
-}
+package org.jivesoftware.smack;
+
+import java.io.IOException;
+import java.io.StringReader;
+
+import org.xmlpull.mxp1.MXParser;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+final public class TestUtils {
+    private TestUtils() {
+    }
+
+    public static XmlPullParser getIQParser(String stanza) {
+        return getParser(stanza, "iq");
+    }
+
+    public static XmlPullParser getMessageParser(String stanza) {
+        return getParser(stanza, "message");
+    }
+
+    public static XmlPullParser getPresenceParser(String stanza) {
+        return getParser(stanza, "presence");
+    }
+
+    public static XmlPullParser getParser(String stanza, String startTag) {
+        XmlPullParser parser = new MXParser();
+        try {
+            parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
+            parser.setInput(new StringReader(stanza));
+            boolean found = false;
+
+            while (!found) {
+                if ((parser.next() == XmlPullParser.START_TAG) && parser.getName().equals(startTag))
+                    found = true;
+            }
+
+            if (!found)
+                throw new IllegalArgumentException("Cannot parse start tag [" + startTag + "] from stanza [" + stanza
+                        + "]");
+        } catch (XmlPullParserException e) {
+            throw new RuntimeException(e);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return parser;
+    }
+
+}