General cleanup

Minor revisions