Various clean ups

Sent with [Gush](http://github.com/gushphp/gush)