Make the CleanHtml a mixin so it can be used easier, add a test case