Formatted code and rebuilt javadoc