Better moves+code cleaning