CS fixes
Merge pull request #1542 from keradus/CS

PSR2 CS fixes