nhl query classes refactor complete