Removed Todos, added Javadoc.