Small refactoring, no functional change