Refactor mType