Refactorz

![thanks for the angry panda img, lukey](http://media2.giphy.com/media/tFUdJEX8jNbe8/giphy.gif)