Refactor notifications to add third 'DELAY' type
Formatting