More tiny refactorings