optimizing imports, fixing replacer entry regex