more clean-up and renaming