Change the HTML tag generator methods + Improved code