Refactor RFSection