clean up and edit?