Format cleanup, javadoc fixes