Alert Summary refactoring