Adding comments and javadocs