Refactored scheduled tasks
Refactored notifications