Refactoring code
Fix wrong notification text