Refactor du code