minor refactor #2