RFV clean code...