Refactor #9

![2014-04-10 10 05 06](https://cloud.githubusercontent.com/assets/931554/2663002/338c66f6-c04c-11e3-974b-b5940e438535.png)