General tidy up
c1