slight refactor, clean-up