some clean up
few unrelated changes