Enhance javadoc comments