Fixed notification name. Minor refactoring.