profile image in notifications, code cleanup