Refactoring

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