Refactrization + PgnFileContent