Added proper javadoc style method comments