Javadoc and formatting