Updating and cleaning up