Fixup code

Signed-off-by: Thomas Leduc <tleduc@epsi.fr>
Merge branch 'refs/heads/feature/cleanup' into develop