Refactor for the win?