minor refactor
minor refactor
minor refactor
refactoring code