mini refactoring
refactoring in progress