added clean option
moved check for move out of getChoice