Refactor des classes Factory en Builder, clean du code des Builder