whitespace cleanup, sort order