Code cleanup
Notifications
Highlighting expired items