Some renaming and html_safe.