cosmetic cleanup before more deep changes