Minor code clean up

Change-Id: Ifa864e0acb253b238b03cdeed0fe5d6ee30a45d8
4 files changed