minor clean up works.