Code Cleanup for Halo