WIP:  Slight cleanup.  Squash