cleaning up and updating