Did a more elegant markup