Improved StrExpand

Speed boost! +Less lines "involved" now. ;)