tidied up formatting