clean up and renames