minor cleaning and renaming