[CLEANUP] Small cleanup and javadocs.