whitespace cleanup
manually merge #803