Small bugs fix
Small code cleaning