Move un-escaping to a separate method
Update comment