Tidy up before publish