Tidied up the formatting