Added some comments

Added Javadoc