tiny bit more refactorings