Tidy markup up a little