Update and Clean up