Remove lodash
Return replace instead of split/join methods