Awesome refactor