Enhanced comments/javadoc