minor clean up
todo