Correct name of the puzzle implementation class
Further reduce construction of collections