ENH:  Fixing figure and cleanup.