Code cleanup

Change-Id: I64c346004e0adf9a776d0315534d4fe445f0c0ca
11 files changed