merging javadoc and comments