Refactored HTML template, made it more readable