Another small refactoring