Refactor

Change-Id: I89ca9cf8a4a53ebecfb668493774fb157a41db8b