Refactor again.  Cleaning up.