replaced string function calls with direct calls, replaced RE to split arguments