Miscellaneous minor cleanup and javadoc

Change-Id: I667a8f6f6ae659741f4c17f3b4abc35daca750f7