Notification Start Fix
Code Clean Up