CS fixes
Merge pull request #364 from thephpleague/cs

CS Fixes