Adding coverage.  Clean-up.