further cleanup and renaming