Tidyup

![image](https://cloud.githubusercontent.com/assets/124026/3868767/7ea19a6e-2062-11e4-9925-d04c24cac9e5.png)