DF-5503 cleaned-up RHI code a bit;