Code Cleanup

Change-Id: I39e3183d6929e3434e65fb0869c832f4f5aee0f6