Refactor to improve lisibility
Merge branch 'review-refactor-sprint'