small progress with cleanups