Refactored HTML5 class
Refactored HTML5 class (2)