Added some javadoc comments