diff --git a/src/main/java/teetime/framework/AbstractStage.java b/src/main/java/teetime/framework/AbstractStage.java
index 88bed6050d5289bed2d12e1d2ac8da7a7459dd22..a880c185bf8c97665ea29c9756c369de0a37ee23 100644
--- a/src/main/java/teetime/framework/AbstractStage.java
+++ b/src/main/java/teetime/framework/AbstractStage.java
@@ -90,22 +90,7 @@ public abstract class AbstractStage extends Stage {
 	@Override
 	public void onInitializing() throws Exception {
 		this.connectUnconnectedOutputPorts();
-		currentState = StageState.INITIALIZED;
-		logger.trace("Initialized.");
-	}
-
-	@Override
-	public void onValidating(final List<InvalidPortConnection> invalidPortConnections) {
-		this.validateOutputPorts(invalidPortConnections);
-		currentState = StageState.VALIDATED;
-		logger.trace("Validated.");
-	}
-
-	@SuppressWarnings("PMD.SignatureDeclareThrowsException")
-	@Override
-	public void onStarting() throws Exception {
-		currentState = StageState.STARTED;
-		logger.trace("Started.");
+		changeState(StageState.INITIALIZED);
 	}
 
 	@SuppressWarnings("PMD.DataflowAnomalyAnalysis")
@@ -120,11 +105,27 @@ public abstract class AbstractStage extends Stage {
 		}
 	}
 
+	private void changeState(final StageState newState) {
+		currentState = newState;
+		logger.trace(newState.toString());
+	}
+
+	@Override
+	public void onValidating(final List<InvalidPortConnection> invalidPortConnections) {
+		this.validateOutputPorts(invalidPortConnections);
+		changeState(StageState.VALIDATED);
+	}
+
+	@SuppressWarnings("PMD.SignatureDeclareThrowsException")
+	@Override
+	public void onStarting() throws Exception {
+		changeState(StageState.STARTED);
+	}
+
 	@SuppressWarnings("PMD.SignatureDeclareThrowsException")
 	@Override
 	public void onTerminating() throws Exception {
-		currentState = StageState.TERMINATED;
-		logger.trace("Terminated.");
+		changeState(StageState.TERMINATED);
 	}
 
 	/**
diff --git a/src/test/java/teetime/stage/basic/distributor/DistributorTest.java b/src/test/java/teetime/stage/basic/distributor/DistributorTest.java
index 3d637d253fe1c64e390a113bc0a7e963e1d5aaad..5e9381d86fd95f073025e49173c29b2c2e66aa30 100644
--- a/src/test/java/teetime/stage/basic/distributor/DistributorTest.java
+++ b/src/test/java/teetime/stage/basic/distributor/DistributorTest.java
@@ -131,7 +131,7 @@ public class DistributorTest {
 	}
 
 	@Test
-	public void cloneForSimpleBeanShoulWork() throws Exception {
+	public void cloneForSimpleBeanShouldWork() throws Exception {
 		final Distributor<SimpleBean> distributor = new Distributor<SimpleBean>(new CloneStrategy());
 		final List<SimpleBean> results = new ArrayList<SimpleBean>();
 		final SimpleBean originalBean = new SimpleBean(42);