Replaced unnecessary regex function calls with faster plain search/replace
calls