clean up and update