more dialog refactoring