partial whitespace cleanup