Cleanup: minor style, Javadoc and code changes
8 files changed