Make usage of whitespace more consistent