Tidy up of previous commit