Minor change to use isinstance instead of type
More refactoring to use isinstance instead of type
Refactored PuzzleKinds to use isinstance instead of type