refactor some classes to discard override
refactor some classes to remove before or after modifiers