Minor re-factor as per PRB request