formatting, javadoc cleaning