Clean up and javadoc. [1826]