mostly whitespace cleanup