minor refactor
minor refactor