Fixup commit needs tidying