Improve CodeClimate score by removing hotspots

![](http://i.imgur.com/XflS1U3.gif)