Minor javadoc update and refactoring