Re-work and clean up the Halo style code

Change-Id: I6dd53bfd3e2bdb339a16f0929c4300dd5e3c59a8