further whitespace cleanup