couple of small "refactorings"