general refactoring and renaming
more refactoring