working on cleaning code.  ToBe continued tomorrow