Cleaned up methods for updating modifier to make them DRY