Added Javadoc commenting