Code Cleanup

Change-Id: I2f84c90f29c88bf5e695c142fe6ecb28d127d548