cleanup and renames