Break up long method into three orthogonal shorter methods. Change-Id: Ieeffd6263b84de50956f03e513f80a9264a09e43