Source cleanup

This patchset is a source cleanup patchset.

It

- Fixes line length in various places to fit into 80 characters/line
- Adds whitespace and blank lines to improve readability
- removes unnecessary whitespace
- moves mutli-statement lines to single-statement lines, which is much more readable.

Hope you like it!


(Btw: squashed from ~20 commits to 4... that's the awesomeness of git!)