A minor refactoring