Cleanup and javaDocs.