Multiples bugs fix + Code cleaning