Refactor methode