Very minor refactoring