Minor javadoc / cleanup