cleanup.  improving UI.