RF refactor