yet more cleanup and renaming