continuing minor refactor