cleanup
Added parseMove