Gratuitous refactor