Refactor the wumpus