Another minor refactor