Move return in drawToCMD() to the end of the function