refractoring for rpm