more cleanup, renaming