CS Fixes

I've brought us back inline with PSR-2 again, and have also cleaned up the imports.