refactor
Namespaced to RF