clean up...move motor stuff to MainActivity