Some sort of refactor, as defined in #3