cleaning up -- getting there :-)