Final tidy up before publishing