cleanup code, javadoc update

cleanup code, javadoc update