NHE gets its house in order