more refmt, const'ing, cleanups 3?