Another minor refactoring