RF - minor cleanup