Scrutinizer cleanup
Some readability improvements
Add some more spaces for operators
Fix a typo
Merge pull request #7485 from owncloud/scrutinizer_fix_1_kondou

Scrutinizer cleanup