REFACTOR #4

![Burn it with FIRE!](http://i.imgur.com/wVrwE.gif)