Cleaning project/Adding notification