Tidied up a bit of the markup