Code refacture.