minor refactor
refactoring