plug gush and some clean up


 Sent using [Gush](https://github.com/gushphp/gush)