This refactoring should be a separate commit and pull request