Formatting and javadoc