Completed re-factor of rif40_geo_pk

1 file/function