Feat/client cleanup

![screen shot 2014-09-08 at 10 10 39 am](https://cloud.githubusercontent.com/assets/6935952/4189320/179bbafe-377b-11e4-88e0-2600ee903af0.png)