Slightly refactored wumpus