refactor
minor refactor