import cleanup

Signed-off-by: Régis Caspar <regis.caspar@gmail.com>
cleanup, refactoring

Signed-off-by: Régis Caspar <regis.caspar@gmail.com>