Refactor notifications
aestetic