Cleanup (javadoc; formatting)