little clean up: still under heavy rewite