more javadoc and cleanup