Comments added (Javadoc)