Added javadoc and javadoc comments