minor refactoring
refactor