Refactor/all the things

![](http://media.giphy.com/media/ZOLcVvXARqWk0/giphy.gif)