whitespace and javadoc nitpicks