diff --git a/com.example.e4.rcp.todo.services/src/com/example/e4/rcp/todo/services/internal/MyTodoServiceImpl.java b/com.example.e4.rcp.todo.services/src/com/example/e4/rcp/todo/services/internal/MyTodoServiceImpl.java
index b335ce32..173fb7e9 100644
--- a/com.example.e4.rcp.todo.services/src/com/example/e4/rcp/todo/services/internal/MyTodoServiceImpl.java
+++ b/com.example.e4.rcp.todo.services/src/com/example/e4/rcp/todo/services/internal/MyTodoServiceImpl.java
@@ -27,7 +27,7 @@ public MyTodoServiceImpl() {
 		todos = createInitialModel();
 	}
 
-	// Always return a new copy of the data
+	// always return a new copy of the data
 	@Override
 	public List<Todo> getTodos() {
 		List<Todo> list = new ArrayList<Todo>();
@@ -37,7 +37,7 @@ public List<Todo> getTodos() {
 		return list;
 	}
 
-	// Saves or updates
+	// create or update an existing instance of Todo
 	@Override
 	public synchronized boolean saveTodo(Todo newTodo) {
 		boolean created = false;
@@ -54,13 +54,16 @@ public synchronized boolean saveTodo(Todo newTodo) {
 
 		// configure the event
 
-		// Send out events
+		// send out events
 		if (created) {
 			broker.post(MyEventConstants.TOPIC_TODO_NEW,
-					createEventData(MyEventConstants.TOPIC_TODO_NEW, String.valueOf(updateTodo.getId())));
+					createEventData(MyEventConstants.TOPIC_TODO_NEW, 
+							String.valueOf(updateTodo.getId())));
 		} else {
-			broker.post(MyEventConstants.TOPIC_TODO_UPDATE,
-					createEventData(MyEventConstants.TOPIC_TODO_UPDATE, String.valueOf(updateTodo.getId())));
+			broker.
+			post(MyEventConstants.TOPIC_TODO_UPDATE,
+			 createEventData(MyEventConstants.TOPIC_TODO_UPDATE, 
+					 String.valueOf(updateTodo.getId())));
 		}
 		return true;
 	}
@@ -82,8 +85,10 @@ public boolean deleteTodo(long id) {
 		if (deleteTodo != null) {
 			todos.remove(deleteTodo);
 			// configure the event
-			broker.post(MyEventConstants.TOPIC_TODO_DELETE,
-					createEventData(MyEventConstants.TOPIC_TODO_DELETE, String.valueOf(deleteTodo.getId())));
+			broker.
+				post(MyEventConstants.TOPIC_TODO_DELETE,
+				 createEventData(MyEventConstants.TOPIC_TODO_DELETE, 
+						 String.valueOf(deleteTodo.getId())));
 			return true;
 		}
 		return false;
@@ -93,7 +98,7 @@ public boolean deleteTodo(long id) {
 	private List<Todo> createInitialModel()         {
 		List<Todo> list = new ArrayList<Todo>();
 		list.add(createTodo("Application model", "Flexible and extensible"));
-		list.add(createTodo("DI", "@Inject as programming mode"));
+		list.add(createTodo("DI", "@Inject as programming mode"));		
 		list.add(createTodo("OSGi", "Services"));
 		list.add(createTodo("SWT", "Widgets"));
 		list.add(createTodo("JFace", "Especially Viewers!"));