Some cleanups

![wtfisthisshit](https://cloud.githubusercontent.com/assets/146040/4672391/b8b8dc10-558e-11e4-8a5a-cab25206e142.jpg)