cleanup, javadoc, renames