diff --git a/org.springframework.integration-tests/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerScopeIntegrationTests.java b/org.springframework.integration-tests/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerScopeIntegrationTests.java
index 4b826450cc737835510eb1c60a4018031f1ea07d..0a120ce8327146c54c30761787b8d3204f428c06 100644
--- a/org.springframework.integration-tests/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerScopeIntegrationTests.java
+++ b/org.springframework.integration-tests/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerScopeIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,11 @@
 
 package org.springframework.context.annotation;
 
-import static org.junit.Assert.*;
-
 import org.junit.After;
+import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
diff --git a/org.springframework.web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java b/org.springframework.web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java
index c870f5b3fd110a89a986539eb8dfa057f94853de..388430d1d6e8622d0bd53c38523fe123ff1d9cad 100644
--- a/org.springframework.web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java
+++ b/org.springframework.web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package org.springframework.web.filter;
 
 import java.io.IOException;
-
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
@@ -203,7 +202,7 @@ public class DelegatingFilterProxy extends GenericFilterBean {
 	/**
 	 * Initialize the Filter delegate, defined as bean the given Spring
 	 * application context.
-	 * <p>Default implementation fetches the bean from the application context
+	 * <p>The default implementation fetches the bean from the application context
 	 * and calls the standard <code>Filter.init</code> method on it, passing
 	 * in the FilterConfig of this Filter proxy.
 	 * @param wac the root application context
@@ -215,7 +214,7 @@ public class DelegatingFilterProxy extends GenericFilterBean {
 	 * @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
 	 */
 	protected Filter initDelegate(WebApplicationContext wac) throws ServletException {
-		Filter delegate = (Filter) wac.getBean(getTargetBeanName(), Filter.class);
+		Filter delegate = wac.getBean(getTargetBeanName(), Filter.class);
 		if (isTargetFilterLifecycle()) {
 			delegate.init(getFilterConfig());
 		}