Optimized regex and removal of spaces - scott