recovery: Code Cleanup

Change-Id: I2a426f6184913f80d1820519eafe1105ce5c7513