This issue is about, simply, clean as many coding style issues as possible under course/format.

The reason is that we already have there some good mixes of different spacings and its some code that we don't change often, so it won't affect backports and friends too much (hopefully).

That's it, ciao