Started regfactoring text treatment