Revert "Cleanup whitespace"

Too much was staged accidentally on that last commit.

This reverts commit f1126272424483efd6d8db7741dfc9949492e026.