cosmetic changes, replace more muls with bitshifts (6g doesn't)