Javadoc and removed TODO