Code formatting and Javadoc