Refacto/uniformisation & correction