Tidied up spacing