Tidied up following PR review