refactor: slight re-organization
refactor: slight re-organization

justinpombrio/PuzzleHunt-PH,justinpombrio/PuzzleHunt-PH,justinpombrio/PuzzleHunt-PH,justinpombrio/PuzzleHunt-PH,justinpombrio/PuzzleHunt-PH