refactoring regex + new infos