Lot more refactoring and organization of field modifiers.