Javadoc and format changes