Tidied up white space