Just a little cleanup.  Now final commit.