Formatting markup better