Minor internal refactor