DRY and fixed HTML-validation errors