Code Cleanup

Change-Id: I39ecc13c411091059f1645fdaeae145d63da6c0a