Fix and clean r_inflate