fix move question + code cleaning