Finalized javadoc comments