Wumpus, refactored