some minor clean up