work on the can and clean a bvit of code

Signed-off-by: makidelille <makidelille@hotmail.fr>