A few cs fixes
PSR-2 fixes
Cleaned up imports
Merge pull request #321 from GrahamCampbell/cs

CS Fixes