Minor cleanup, white space removal, and revision of javadoc