removed unnecessary TODOs, added javadoc