Mostly improved Javadoc
Some other minor code style cleanup
Merge pull request #1512 from pveentjer/cleanup/3.x/javadoc

Mostly improved Javadoc