Refactoring notification objects