minor cleanup and renaming