HALO: Code cleaning up

Credits to: Anu6is

Change-Id: I10c3db6a538ba475f567e3e00fe6f92e00364bbc
Merge remote-tracking branch 'upstream/jb3' into jb3