Got rid of hardcoded notification texts