Update and Clean Up