minor refactoring
Full modifier support