tiny refactorings