Made the move chooser simpler