Final tidy up after checking against earlier comments