diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java
index d9cbc25ce9..8bd867654b 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java
@@ -43,8 +43,11 @@ import org.springframework.integration.scheduling.TaskSchedulerAware;
 import org.springframework.util.Assert;
 
 /**
- * The messaging bus. Serves as a registry for channels and endpoints, manages their lifecycle,
- * and activates subscriptions.
+ * Spring Integration's standard Message Bus implementation. Serves as a
+ * registry for Messages Endpoints. Manages their lifecycle, activates
+ * subscriptions, and schedules pollers by delegating to a
+ * {@link TaskScheduler}. Retrieves MessageChannels from the
+ * ApplicationContext based on bean name.
  * 
  * @author Mark Fisher
  * @author Marius Bogoevici
@@ -96,17 +99,6 @@ public class DefaultMessageBus implements MessageBus, ApplicationContextAware, A
 		this.autoStartup = autoStartup;
 	}
 
-	public void initialize() {
-		synchronized (this.lifecycleMonitor) {
-			if (this.initialized) {
-				return;
-			}
-			Assert.notNull(this.applicationContext, "ApplicationContext must not be null");
-			Assert.notNull(this.taskScheduler, "TaskScheduler must not be null");
-			this.initialized = true;
-		}
-	}
-
 	public MessageChannel lookupChannel(String channelName) {
 		Assert.notNull(this.applicationContext, "ApplicationContext must not be null");
 		if (this.applicationContext.containsBean(channelName)) {
@@ -128,12 +120,6 @@ public class DefaultMessageBus implements MessageBus, ApplicationContextAware, A
 		return null;
 	}
 
-	private Collection<MessageEndpoint> getEndpoints() {
-		GenericBeanFactoryAccessor accessor = new GenericBeanFactoryAccessor(this.applicationContext);
-		this.endpoints.addAll(accessor.getBeansOfType(MessageEndpoint.class).values());
-		return this.endpoints;
-	}
-
 	public void registerEndpoint(MessageEndpoint endpoint) {
 		Assert.notNull(endpoint, "'endpoint' must not be null");
 		if (!this.endpoints.contains(endpoint)) {
@@ -147,6 +133,12 @@ public class DefaultMessageBus implements MessageBus, ApplicationContextAware, A
 		}
 	}
 
+	private Collection<MessageEndpoint> getEndpoints() {
+		GenericBeanFactoryAccessor accessor = new GenericBeanFactoryAccessor(this.applicationContext);
+		this.endpoints.addAll(accessor.getBeansOfType(MessageEndpoint.class).values());
+		return this.endpoints;
+	}
+
 	private void activateEndpoints() {
 		for (MessageEndpoint endpoint : this.getEndpoints()) {
 			if (endpoint != null) {
@@ -233,6 +225,23 @@ public class DefaultMessageBus implements MessageBus, ApplicationContextAware, A
 		}
 	}
 
+	public void onApplicationEvent(ApplicationEvent event) {
+		if (event instanceof ContextRefreshedEvent && this.autoStartup) {
+			this.start();
+		}
+	}
+
+	private void initialize() {
+		synchronized (this.lifecycleMonitor) {
+			if (this.initialized) {
+				return;
+			}
+			Assert.notNull(this.applicationContext, "ApplicationContext must not be null");
+			Assert.notNull(this.taskScheduler, "TaskScheduler must not be null");
+			this.initialized = true;
+		}
+	}
+
 	public void destroy() throws Exception {
 		this.stop();
 		if (this.taskScheduler instanceof DisposableBean) {
@@ -240,12 +249,6 @@ public class DefaultMessageBus implements MessageBus, ApplicationContextAware, A
 		}
 	}
 
-	public void onApplicationEvent(ApplicationEvent event) {
-		if (event instanceof ContextRefreshedEvent && this.autoStartup) {
-			this.start();
-		}
-	}
-
 	public void addInterceptor(MessageBusInterceptor interceptor) {
 		this.interceptors.add(interceptor);
 	}
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java
index f1a719dc79..fd2fdb1923 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java
@@ -52,7 +52,6 @@ public class MessageBusParserTests {
 		ApplicationContext context = new ClassPathXmlApplicationContext(
 				"messageBusWithErrorChannel.xml", this.getClass());
 		DefaultMessageBus bus = (DefaultMessageBus) context.getBean(MessageBusParser.MESSAGE_BUS_BEAN_NAME);
-		bus.initialize();
 		MessageChannel channel = bus.lookupChannel(DefaultMessageBus.ERROR_CHANNEL_BEAN_NAME);
 		assertEquals(context.getBean("errorChannel"), channel);
 	}
@@ -62,7 +61,6 @@ public class MessageBusParserTests {
 		ApplicationContext context = new ClassPathXmlApplicationContext(
 				"messageBusWithDefaults.xml", this.getClass());
 		DefaultMessageBus bus = (DefaultMessageBus) context.getBean(MessageBusParser.MESSAGE_BUS_BEAN_NAME);
-		bus.initialize();
 		assertNotNull("parser should have created a default error channel",
 				bus.lookupChannel(DefaultMessageBus.ERROR_CHANNEL_BEAN_NAME));
 	}