RFM refactor

Continue the code refactor by continuing the RFM class evolution.