Formating and refactoring
Signed-off-by:Guillaume Martigny <guillaume.martigny@gmail.com>
Lots of correction for old code
Signed-off-by:Guillaume Martigny <guillaume.martigny@gmail.com>