Refactor, clean up Javadoc's