tidied up indents and spaces