some refactoring
naming refactored