General polishing for publication.