Work whitespace cleanup