slight refactor
refactor