minor refactor
fix