Very small refactoring