Tiny refactorings