Tidied up after removing whitespace