A few small refactorings