Trailing whitespace
Spaces
Indention
Blank line
Merge pull request #2055 from rarila/coding-style

Coding style