RF# minor refactor