Added Javadoc/comments