One minor refactoring