removed code complexity
refactoring cleanup