Refactoring

Change-Id: I17025522ebce029f50d475a7259d33620af31fd3