Tidied up whitespace