Fix bps calculation and eliminate unnecessary iteration counter