RF: Minor cleanup