Refactored Modifiers class.