Cleaned up code to use short[][] instead of a PuzzleBoard object