cleaned up the Haz interface