refactoring.
More rf.
Lotsa rf.