Refactored HTML