Refactor mutators for cleanliness