Adding comments and javadoc
+1