Refactoring
Signed-off-by:Guillaume Martigny <guillaume.martigny@gmail.com>