Slight refactor for accomodate later code unification.