cleanup. javadoc, adjusted formatters.

cleanup. javadoc, adjusted formatters.