remove escaper functions in favor of static methods