minor revisions/cleanup.