Refactoring de la classe.

Signed-off-by: Ariault Blanchard <arblanchar@gmail.com>