Refactor

Change-Id: Idc95d429ec66ad0c82bd1147ce83b0130a9b8c79
Fix

Change-Id: I2b5d2faf5b3f3f77627be8caa8dab89dec6d5d0c