Slight refactorings