Refactor mutation