Very minor refactorings