rename
clean up
clean up data