Improved comments for javadoc