Minor cleanup and javadoc.