Rename id to be more explicit and remove comment
Merge pull request #5 from Versal/fix/remove-todo

Replace id with class