refactor auv_cont to remove And and fix simple_move_def (correcting constand to t)