tiny refactorings.