Refactoring Devis to Bill