More whitespace

Hijacked by @jancborchardt because the changes were a good starting point. :)