Small refactoring, better way to find puzzle id