Added some Javadoc comments