[+] HTM refactoring