tidied up spaces