Refactored, simplified notification methods
Refactoring/renaming

[skip ci]