ISRMotorcontrol cleaned up