some cleanup and renaming