Re-work and clean up the Halo style code