Minor refactoring
Adding local notification