Get rid of Modifier class. Condition will stand on its own.