RF minor clean-up

Signed-off-by: Jeremy R. Gray <jrgray@gmail.com>