minor refactoring and added notification models to alerts