diff --git a/Common/3dParty/html/htmltoxhtml.cpp b/Common/3dParty/html/htmltoxhtml.cpp
index 5363122372..11e5ca9579 100644
--- a/Common/3dParty/html/htmltoxhtml.cpp
+++ b/Common/3dParty/html/htmltoxhtml.cpp
@@ -522,7 +522,7 @@ static void prettyprint_contents(GumboNode* node, NSStringUtils::CStringBuilderA
 			remove_control_symbols(val);
 			substitute_xml_entities_into_text(val);
 
-			// Remove FF (form feed)
+			// Remove FF
 			size_t found = val.find_first_of("\014");
 			while(found != std::string::npos)
 			{
diff --git a/DesktopEditor/doctrenderer/drawingfile.h b/DesktopEditor/doctrenderer/drawingfile.h
index 9e2b361baf..5c33a0b2bc 100644
--- a/DesktopEditor/doctrenderer/drawingfile.h
+++ b/DesktopEditor/doctrenderer/drawingfile.h
@@ -311,7 +311,7 @@ public:
 				memcpy(pCopy, data, size);
 				data = pCopy;
 			}
-			// Captures the received memory, will be freed either in MemStream destructor, or via free on failure
+			// Captures the received memory, will be freed either in MemStream destructor or on failure
 			return ((CPdfFile*)m_pFile)->MergePages(data, size, nMaxID, sPrefixForm);
 		}
 		return false;
diff --git a/Fb2File/Fb2File.cpp b/Fb2File/Fb2File.cpp
index 42e4544d68..85186b7107 100644
--- a/Fb2File/Fb2File.cpp
+++ b/Fb2File/Fb2File.cpp
@@ -39,7 +39,7 @@ struct CTc
 	}
 };
 
-// Description of work information. Tag: title-info, src-title-info
+// Description of book information. Tag: title-info, src-title-info
 struct STitleInfo
 {
 	std::wstring m_sGenres;    // Genres
@@ -350,7 +350,7 @@ public:
 		int nDeath = m_oLightReader.GetDepth();
 		while (m_oLightReader.ReadNextSiblingNode(nDeath))
 		{
-			// Write heading
+			// Write title
 			if (m_oLightReader.GetName() == L"p")
 			{
 				// Write title + sLevel
diff --git a/Fb2File/xml/tmp/main.cpp b/Fb2File/xml/tmp/main.cpp
index 68abb4fef6..ca7f5508f6 100644
--- a/Fb2File/xml/tmp/main.cpp
+++ b/Fb2File/xml/tmp/main.cpp
@@ -7,7 +7,7 @@ int main()
     // sax reader
     XmlUtils::CXmlLiteReader oLightReader;
     /*
-    Conclusions:
+    Output:
     Returns success of file opening
     Reads file into m_pStream stream
     Stream length in m_lStreamLen
diff --git a/HtmlFile2/htmlfile2.cpp b/HtmlFile2/htmlfile2.cpp
index d5691dcd93..c4e3b35dd1 100644
--- a/HtmlFile2/htmlfile2.cpp
+++ b/HtmlFile2/htmlfile2.cpp
@@ -4970,7 +4970,7 @@ private:
 			return false;
 
 		unsigned int alfa = 0xffffff;
-		//default tone should be transparent, not white
+		//default background should be transparent, not white
 		//memset(pBgraData, 0xff, nWidth * nHeight * 4);
 		for (int i = 0; i < nWidth * nHeight; i++)
 		{
diff --git a/PdfFile/PdfEditor.cpp b/PdfFile/PdfEditor.cpp
index 490bcd1af3..e56fdc188d 100644
--- a/PdfFile/PdfEditor.cpp
+++ b/PdfFile/PdfEditor.cpp
@@ -1935,7 +1935,7 @@ bool CPdfEditor::EditPage(int _nPageIndex, bool bSet, bool bActualPos)
 			}
 			else if (strcmp("Parent", chKey) == 0)
 			{
-				// Parent page fields are transferred to the pages themselves
+				// Fields from Parent pages are transferred to the pages themselves
 				oTemp.free();
 				continue;
 			}
@@ -3013,7 +3013,7 @@ bool CPdfEditor::PrintPages(const std::vector<bool>& arrPages, int nFlag)
 			}
 			else if (strcmp("Parent", chKey) == 0)
 			{
-				// Parent page fields are transferred to the pages themselves
+				// Fields from Parent pages are transferred to the pages themselves
 				oTemp.free();
 				continue;
 			}
@@ -3355,7 +3355,7 @@ bool CPdfEditor::AddPage(int nPageIndex)
 	// Apply page addition for writer
 	if (!m_pWriter->AddPage(nPageIndex))
 		return false;
-	// By default, first page dimensions are set, they can be changed later
+	// By default, first page dimensions are set for new page, they can be changed later
 	double dPageDpiX, dPageDpiY;
 	double dWidth, dHeight;
 	m_pReader->GetPageInfo(0, &dWidth, &dHeight, &dPageDpiX, &dPageDpiY);
@@ -4303,8 +4303,8 @@ std::vector<double> CPdfEditor::WriteRedact(const std::vector<std::wstring>& arr
 		m_pWriter->put_BrushAlpha1(lAlpha1);
 		m_pWriter->put_BrushAlpha2(lAlpha2);
 
-		// TODO edit render should intersect with all subsequent edits
-		// TODO actually there should be render of edit commands
+		// TODO Redact render should intersect with all subsequent Redacts
+		// TODO actually there should be render of Redact commands
 		/*
 		PdfWriter::CPage* pCurPage = m_pWriter->GetPage();
 		pDoc->FixEditPage(pCurPage);
diff --git a/PdfFile/PdfWriter.cpp b/PdfFile/PdfWriter.cpp
index 509c9a4cc7..d9d28cfbf6 100644
--- a/PdfFile/PdfWriter.cpp
+++ b/PdfFile/PdfWriter.cpp
@@ -3464,7 +3464,7 @@ bool CPdfWriter::DrawText(unsigned char* pCodes, const unsigned int& unLen, cons
 		return false;
 
 	// TODO should check center position, not start point
-	// TODO Many characters arrive here at once, and we need to draw only those outside redact areas
+	// TODO Many characters arrive here at once, and we need to draw only those outside Redact areas
 	if (SkipRedact(dX, dY))
 		return true;
 
@@ -3493,7 +3493,7 @@ bool CPdfWriter::DrawTextToRenderer(const unsigned int* unGid, const unsigned in
 	if (m_bSplit)
 		return false;
 	// TODO should check center position, not start point
-	// TODO Many characters arrive here at once, and we need to draw only those outside redact areas
+	// TODO Many characters arrive here at once, and we need to draw only those outside Redact areas
 	if (SkipRedact(dX, dY))
 		return true;
 	// TODO pdf allows creating custom font, but this should not be used to recreate a font that is prohibited for editing or embedding
@@ -3512,7 +3512,7 @@ bool CPdfWriter::DrawTextToRenderer(const unsigned int* unGid, const unsigned in
 bool CPdfWriter::PathCommandDrawText(unsigned int* pUnicodes, unsigned int unLen, const double& dX, const double& dY, const unsigned int* pGids)
 {
 	// TODO should check center position, not start point
-	// TODO Many characters arrive here at once, and we need to draw only those outside redact areas
+	// TODO Many characters arrive here at once, and we need to draw only those outside Redact areas
 	if (SkipRedact(dX, dY))
 		return true;
 
diff --git a/PdfFile/SrcReader/PdfAnnot.cpp b/PdfFile/SrcReader/PdfAnnot.cpp
index 2342f6dd81..3ecece0477 100644
--- a/PdfFile/SrcReader/PdfAnnot.cpp
+++ b/PdfFile/SrcReader/PdfAnnot.cpp
@@ -646,7 +646,7 @@ CAnnotWidgetBtn::CAnnotWidgetBtn(PDFDoc* pdfDoc, AcroFormField* pField, int nSta
 			oObj.free();
 		}
 
-		// 13 - Caption position - TP
+		// 13 - Title position - TP
 		if (oMK.dictLookup("TP", &oObj)->isInt())
 		{
 			m_nTP = oObj.getInt();
diff --git a/PdfFile/SrcWriter/EncryptDictionary.cpp b/PdfFile/SrcWriter/EncryptDictionary.cpp
index cd1e040fc7..c52c2e74c6 100644
--- a/PdfFile/SrcWriter/EncryptDictionary.cpp
+++ b/PdfFile/SrcWriter/EncryptDictionary.cpp
@@ -94,7 +94,7 @@ namespace PdfWriter
 		std::time_t oTime = time(0);
         hash.Update( (BYTE*)&oTime, sizeof(oTime));
 
-		// Create file identifier from Info library elements.
+		// Create file identifier from Info elements.
 		if (pInfo)
 		{
 			const char *sTemp = NULL;
diff --git a/PdfFile/SrcWriter/Field.cpp b/PdfFile/SrcWriter/Field.cpp
index ad8f1ec3d8..c4e6b2ba64 100644
--- a/PdfFile/SrcWriter/Field.cpp
+++ b/PdfFile/SrcWriter/Field.cpp
@@ -3279,7 +3279,7 @@ namespace PdfWriter
 			}
 		}
 
-		// Set (checked)
+		// Set
 		if (!bSet)
 			return;
 		double dShift = dBorder / 2.0;
@@ -3390,7 +3390,7 @@ namespace PdfWriter
 			m_pStream->WriteStr("s\012Q\012");
 		}
 
-		// Set (checked)
+		// Set
 		if (!bSet)
 			return;
 		double dDiff = std::abs(dW - dH) / 2.0;
diff --git a/PdfFile/SrcWriter/Pages.cpp b/PdfFile/SrcWriter/Pages.cpp
index ae081ad6ba..ceba409102 100644
--- a/PdfFile/SrcWriter/Pages.cpp
+++ b/PdfFile/SrcWriter/Pages.cpp
@@ -1696,7 +1696,7 @@ namespace PdfWriter
 	void CPage::BeginMarkedContentDict(const std::string& sName, CDictObject* pBDC)
 	{
 		// Operator   : BDC
-		// Description: Begin marked content with property list
+		// Description: Begin marked content with dict
 
 		m_pStream->WriteEscapeName(sName.c_str());
 		m_pStream->WriteChar(' ');
@@ -1713,7 +1713,7 @@ namespace PdfWriter
 	void CPage::SetRenderingIntent(ERenderingIntent eRenderingIntent)
 	{
 		// Operator   : ri
-		// Description: Rendering intent / color reproduction methods
+		// Description: Rendering intent / color rendering methods
 
 		m_pStream->WriteEscapeName(c_sRenderingIntent[(int)eRenderingIntent]);
 		m_pStream->WriteStr(" ri\012");