Revert "whitespace fixes"

This reverts commit 144af854aeebac8deb5416b9fe909022a013fd75.
whitespace fixes (redo)