A small refactoring