Code cleanup.  V2.0.1