RF: minor clean-up