Refactorage + instr Q