Tidied up indentation