notifications/code cleanup