Improved Model Predictive Control Design For Current-Source And Voltage-Source Motor Drives