further minor refactor