Refactor
Add specs for html validation