* Tidy up for publication.