JC-1869 Fixed some javadocs, formatting, names, modifiers