CS & composer fixes

See https://github.com/pierrejoye/pickle/pull/1/files?w=1 for a better diff without line ending changes and other whitespace crap.