more whitespace cleanup