Refactor cliapp

![cliapp-application](https://f.cloud.github.com/assets/33978/2060688/e02e4634-8c28-11e3-8814-5bf6c8c077e9.png)
I believe this looks, feels and smells better :wink: