RF: minor code cleanup