firstapproach: Refactorings