diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/Formatted.java b/org.springframework.context/src/main/java/org/springframework/ui/format/Formatted.java
index bac1863885..e717697f4f 100644
--- a/org.springframework.context/src/main/java/org/springframework/ui/format/Formatted.java
+++ b/org.springframework.context/src/main/java/org/springframework/ui/format/Formatted.java
@@ -22,7 +22,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * A type that can be formatted as a String for display in a UI.
+ * A type that can be formatted as a String for display in a user interface.
  * @author Keith Donald
  * @since 3.0
  */
diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/FormatterRegistry.java b/org.springframework.context/src/main/java/org/springframework/ui/format/FormatterRegistry.java
index 62d997461d..c39c1b8372 100644
--- a/org.springframework.context/src/main/java/org/springframework/ui/format/FormatterRegistry.java
+++ b/org.springframework.context/src/main/java/org/springframework/ui/format/FormatterRegistry.java
@@ -56,6 +56,7 @@ public interface FormatterRegistry {
 	 * Get the Formatter for the type.
 	 * @return the Formatter, or <code>null</code> if none is registered
 	 */
+	@SuppressWarnings("unchecked")
 	Formatter getFormatter(TypeDescriptor type);
 
 }
diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/GenericFormatterRegistry.java b/org.springframework.context/src/main/java/org/springframework/ui/format/GenericFormatterRegistry.java
index b4f85b0077..c2254113cf 100644
--- a/org.springframework.context/src/main/java/org/springframework/ui/format/GenericFormatterRegistry.java
+++ b/org.springframework.context/src/main/java/org/springframework/ui/format/GenericFormatterRegistry.java
@@ -42,6 +42,8 @@ public class GenericFormatterRegistry implements FormatterRegistry {
 
 	private Map<Class, AnnotationFormatterFactory> annotationFormatters = new HashMap<Class, AnnotationFormatterFactory>();
 
+	// implementing FormatterRegistry
+	
 	public <T> void add(Formatter<T> formatter) {
 		// TODO
 	}
diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/date/DateFormatter.java b/org.springframework.context/src/main/java/org/springframework/ui/format/date/DateFormatter.java
index d5c5c152bd..416770d218 100644
--- a/org.springframework.context/src/main/java/org/springframework/ui/format/date/DateFormatter.java
+++ b/org.springframework.context/src/main/java/org/springframework/ui/format/date/DateFormatter.java
@@ -26,13 +26,13 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.ui.format.Formatter;
 
 /**
- * A formatter for {@link Date} types.
+ * A formatter for {@link java.util.Date} types.
  * Allows the configuration of an explicit date pattern and locale.
  * @author Keith Donald
  * @since 3.0
  * @see SimpleDateFormat 
  */
-public class DateFormatter implements Formatter<Date> {
+public final class DateFormatter implements Formatter<Date> {
 
 	private static Log logger = LogFactory.getLog(DateFormatter.class);
 
@@ -66,9 +66,9 @@ public class DateFormatter implements Formatter<Date> {
 		return getDateFormat(locale).parse(formatted);
 	}
 
-	// subclassing hookings
+	// internal helpers
 
-	protected DateFormat getDateFormat(Locale locale) {
+	private DateFormat getDateFormat(Locale locale) {
 		DateFormat format = DateFormat.getDateInstance(DateFormat.SHORT, locale);
 		format.setLenient(false);
 		if (format instanceof SimpleDateFormat) {
@@ -81,8 +81,6 @@ public class DateFormatter implements Formatter<Date> {
 		return format;
 	}
 
-	// internal helpers
-
 	private String determinePattern(String pattern) {
 		return pattern != null ? pattern : DEFAULT_PATTERN;
 	}
diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/number/CurrencyFormatter.java b/org.springframework.context/src/main/java/org/springframework/ui/format/number/CurrencyFormatter.java
index d12e1ea432..c0604223cb 100644
--- a/org.springframework.context/src/main/java/org/springframework/ui/format/number/CurrencyFormatter.java
+++ b/org.springframework.context/src/main/java/org/springframework/ui/format/number/CurrencyFormatter.java
@@ -33,7 +33,7 @@ import org.springframework.ui.format.Formatter;
  * @author Keith Donald
  * @since 3.0
  */
-public class CurrencyFormatter implements Formatter<BigDecimal> {
+public final class CurrencyFormatter implements Formatter<BigDecimal> {
 
 	private CurrencyNumberFormatFactory currencyFormatFactory = new CurrencyNumberFormatFactory();
 
diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/number/DecimalFormatter.java b/org.springframework.context/src/main/java/org/springframework/ui/format/number/DecimalFormatter.java
index 1ba182f562..736e4d0e2d 100644
--- a/org.springframework.context/src/main/java/org/springframework/ui/format/number/DecimalFormatter.java
+++ b/org.springframework.context/src/main/java/org/springframework/ui/format/number/DecimalFormatter.java
@@ -31,7 +31,7 @@ import org.springframework.ui.format.Formatter;
  * @author Keith Donald
  * @since 3.0
  */
-public class DecimalFormatter implements Formatter<BigDecimal> {
+public final class DecimalFormatter implements Formatter<BigDecimal> {
 
 	private DefaultNumberFormatFactory formatFactory = new DefaultNumberFormatFactory();
 
diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/number/IntegerFormatter.java b/org.springframework.context/src/main/java/org/springframework/ui/format/number/IntegerFormatter.java
index 3535dfc383..7825997aaa 100644
--- a/org.springframework.context/src/main/java/org/springframework/ui/format/number/IntegerFormatter.java
+++ b/org.springframework.context/src/main/java/org/springframework/ui/format/number/IntegerFormatter.java
@@ -28,7 +28,7 @@ import org.springframework.ui.format.Formatter;
  * @author Keith Donald
  * @since 3.0
  */
-public class IntegerFormatter implements Formatter<Long> {
+public final class IntegerFormatter implements Formatter<Long> {
 
 	private IntegerNumberFormatFactory formatFactory = new IntegerNumberFormatFactory();
 
diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/number/PercentFormatter.java b/org.springframework.context/src/main/java/org/springframework/ui/format/number/PercentFormatter.java
index 5044b28464..fee2195b55 100644
--- a/org.springframework.context/src/main/java/org/springframework/ui/format/number/PercentFormatter.java
+++ b/org.springframework.context/src/main/java/org/springframework/ui/format/number/PercentFormatter.java
@@ -30,7 +30,7 @@ import org.springframework.ui.format.Formatter;
  * @author Keith Donald
  * @since 3.0
  */
-public class PercentFormatter implements Formatter<BigDecimal> {
+public final class PercentFormatter implements Formatter<BigDecimal> {
 
 	private PercentNumberFormatFactory percentFormatFactory = new PercentNumberFormatFactory();