Organized imports.
Small readability adjustments; fix Javadoc template syntax

I am thankful for programmers like you, whose code (in addition to -
look out, meta comment incoming - commit messages) is still readable by
human beings. I have long since lost this characteristic...