fix the import rules and convert to StringUtils
update recent changes