Refactor.

Change-Id: I99c4f97c4b9ad70750abaccf73af22086d0a4a05