CS fixes

- PSR2 compliance
Merge branch 'hotfix/cs-fixes'