More slight refactorings