Refactor rf-1