Some first refactorings