refactoring
refactoring
refactoring
Smart close handled by controller. Close to notification handled by window