Small refactorings again