More modal refactoring