Tidied up formatting