Cleanup, JavaDoc edits