diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
index 0a149548198..853657891c2 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
@@ -167,8 +167,7 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
 
 		private static final String[] EXPRESSION_PROPERTIES = new String[] {"value", "pointcut"};
 
-		private static Map<Class<?>, AspectJAnnotationType> annotationTypes =
-				new HashMap<>();
+		private static Map<Class<?>, AspectJAnnotationType> annotationTypes = new HashMap<>();
 
 		static {
 			annotationTypes.put(Pointcut.class,AspectJAnnotationType.AtPointcut);
diff --git a/spring-context/src/main/java/org/springframework/context/support/GenericXmlApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/GenericXmlApplicationContext.java
index 4fc2d52b7b9..0dcb646eae8 100644
--- a/spring-context/src/main/java/org/springframework/context/support/GenericXmlApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/support/GenericXmlApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -29,7 +29,8 @@ import org.springframework.core.io.Resource;
  *
  * <p>In case of multiple configuration files, bean definitions in later files
  * will override those defined in earlier files. This can be leveraged to
- * deliberately override certain bean definitions via an extra configuration file.
+ * intentionally override certain bean definitions via an extra configuration
+ * file appended to the list.
  *
  * @author Juergen Hoeller
  * @author Chris Beams
@@ -108,6 +109,11 @@ public class GenericXmlApplicationContext extends GenericApplicationContext {
 		this.reader.setEnvironment(getEnvironment());
 	}
 
+
+	//---------------------------------------------------------------------
+	// Convenient methods for loading XML bean definition files
+	//---------------------------------------------------------------------
+
 	/**
 	 * Load bean definitions from the given XML resources.
 	 * @param resources one or more resources to load from