Code Cleaning (Halo)

Change-Id: I567661b8da683877a1a9e378dc7aa8c29ae0e154