markup tidied up