CS Fixes

Also, how far off is the v0.2.0 release because I'm looking to update my laravel package to it.