PSR-2 fixes
cs fixes
Merge pull request #1 from smoench/patch-1

PSR-1 + PSR-2 fixes