Sort import list and use descriptive sames rather than single letter qualifiers.

To be consistent with style guide.
Limit whitespace errors to trailing-space,tab-in-indent.