another minor refactor