Changes based on code review and javadoc.