Refactorings again