A little bit of clean up and javadoc clarifications