Cleaned up mutator code