Lucas refactoring

![thanks for the fuck this shit img, lukey](http://media2.giphy.com/media/DjN8F2K8RQlPy/giphy.gif)