Refactored markup