Formatting and javadoc changes