more refactoring and re-naming