minor clean ... rename