Code cleanup

There is _no_ functionality changed by these two commits!

I did some code-styling for better readability. Everything else you can read from the commit messages. I would love to see this merged.

regards,
Matthias