Refactor for better NHL initialization