refactoring of escapers module