Add data-* attribute. Removed unsed comment code