cleaning up, updating