Minor cleanup and revisions