rf: consolidate vars