Fix formatting and javadoc.