rebin cosmetic code cleanups