The refactor