Better markup