Javadoc, renaming, and cleanup.