First cleanup pass complete.  Resolves #1