More sorting out of whitespace