Tidied up a messed-up commit