some clean up and reorging