Cleanup and javadoc. [0]