minor clean up changes