Notification optimisation and formatting

Error Handling