HALO: what else, style changes

Change-Id: I9c467ca1410b2ab91c90d1d02f4af8e01aae8ff9