minor clean up works