cleaner SpeedRFP code