Harmonized white spaces
Minor style adaptions.

According to the comments by @marcjansen some minor style adaptions are
added by this commit.