diff --git a/doc/examples/pibytearray.cpp b/doc/examples/pibytearray.cpp
index 64592224..8dc3c980 100644
--- a/doc/examples/pibytearray.cpp
+++ b/doc/examples/pibytearray.cpp
@@ -1,63 +1,69 @@
 #include "pip.h"
 
 void _() {
-//! [0]
-PIByteArray ba;
-int i = -1, j = 2;
-float f = 1.;
-PIString text("123");
-ba << i << j << f << text; // form binary data
-piCout << "data =" << ba;
-i = j = 0; // clear variables
-f = 0; // clear variables
-text.clear(); // clear variables
-piCout << i << j << f << text; // show variables
-ba >> i >> j >> f >> text; // restore data
-piCout << i << j << f << text; // show variables
-piCout << "data =" << ba;
-//! [0]
-//! [1]
-struct MyType {
-	MyType(int i_ = 0, const PIString & t_ = PIString()) {
-		m_i = i_;
-		m_text = t_;
+	//! [0]
+	PIByteArray ba;
+	int i = -1, j = 2;
+	float f = 1.;
+	PIString text("123");
+	ba << i << j << f << text; // form binary data
+	piCout << "data =" << ba;
+	i = j = 0;                     // clear variables
+	f     = 0;                     // clear variables
+	text.clear();                  // clear variables
+	piCout << i << j << f << text; // show variables
+	ba >> i >> j >> f >> text;     // restore data
+	piCout << i << j << f << text; // show variables
+	piCout << "data =" << ba;
+	//! [0]
+	//! [1]
+	struct MyType {
+		MyType(int i_ = 0, const PIString & t_ = PIString()) {
+			m_i    = i_;
+			m_text = t_;
+		}
+		int m_i;
+		PIString m_text;
+	};
+
+	inline PIByteArray & operator<<(PIByteArray & s, const MyType & v) {
+		s << v.m_i << v.m_text;
+		return s;
+	}
+	inline PIByteArray & operator>>(PIByteArray & s, MyType & v) {
+		s >> v.m_i >> v.m_text;
+		return s;
 	}
-	int m_i;
-	PIString m_text;
-};
 
-inline PIByteArray & operator <<(PIByteArray & s, const MyType & v) {s << v.m_i << v.m_text; return s;}
-inline PIByteArray & operator >>(PIByteArray & s, MyType & v) {s >> v.m_i >> v.m_text; return s;}
-
-PIByteArray ba;
-PIVector<MyType> my_vec;
-my_vec << MyType(1, "s1") << MyType(10, "s10"); // add to vector
-ba << my_vec; // store to byte array
-piCout << "data =" << ba;
-my_vec.clear(); // clear vector
-ba >> my_vec; // restore from byte array
-//! [1]
-//! [2]
-PIByteArray ba;
-const char * chars = "8 bytes";
-ba << PIByteArray::RawData(chars, 8); // form binary data
-piCout << "data =" << ba;
-char rchars[16];
-memset(rchars, 0, 16); // clear data
-ba >> PIByteArray::RawData(rchars, 8); // restore data
-piCout << rchars;
-piCout << "data =" << ba;
-//! [2]
-//! [3]
-PIByteArray ba, sba;
-uchar uc(127);
-sba << uc; // byte array with one byte
-ba << sba; // stream operator
-piCout << ba; // result
-// {1, 0, 0, 0, 127}
-ba.clear();
-ba.append(sba);
-piCout << ba; // result
-// {127}
-//! [3]
+	PIByteArray ba;
+	PIVector<MyType> my_vec;
+	my_vec << MyType(1, "s1") << MyType(10, "s10"); // add to vector
+	ba << my_vec;                                   // store to byte array
+	piCout << "data =" << ba;
+	my_vec.clear(); // clear vector
+	ba >> my_vec;   // restore from byte array
+	//! [1]
+	//! [2]
+	PIByteArray ba;
+	const char * chars = "8 bytes";
+	ba << PIByteArray::RawData(chars, 8); // form binary data
+	piCout << "data =" << ba;
+	char rchars[16];
+	memset(rchars, 0, 16);                 // clear data
+	ba >> PIByteArray::RawData(rchars, 8); // restore data
+	piCout << rchars;
+	piCout << "data =" << ba;
+	//! [2]
+	//! [3]
+	PIByteArray ba, sba;
+	uchar uc(127);
+	sba << uc;    // byte array with one byte
+	ba << sba;    // stream operator
+	piCout << ba; // result
+	// {1, 0, 0, 0, 127}
+	ba.clear();
+	ba.append(sba);
+	piCout << ba; // result
+	// {127}
+	//! [3]
 };
diff --git a/doc/examples/picli.cpp b/doc/examples/picli.cpp
index 6286754c..476a98cf 100644
--- a/doc/examples/picli.cpp
+++ b/doc/examples/picli.cpp
@@ -3,5 +3,4 @@
 //! [main]
 //! [main]
 
-void _() {
-};
+void _() {};
diff --git a/doc/examples/picollection.cpp b/doc/examples/picollection.cpp
index 8f2e82d8..fc135ca5 100644
--- a/doc/examples/picollection.cpp
+++ b/doc/examples/picollection.cpp
@@ -26,23 +26,23 @@ class ElementD: public PIObject {
 int main() {
 	ElementD * el_d = new ElementD();
 	ADD_TO_COLLECTION(ab_group, el_d)
-	
+
 	PIStringList gl = PICollection::groups();
 	piCout << gl; // {"ab_group", "c_group"}
-	piForeachC (PIString g, gl) {
-		PIVector<const PIObject * > go = PICollection::groupElements(g);
+	piForeachC(PIString g, gl) {
+		PIVector<const PIObject *> go = PICollection::groupElements(g);
 		piCout << "group" << g << ":";
-		piForeachC (PIObject * o, go)
+		piForeachC(PIObject * o, go)
 			piCout << Tab << o->className();
 	}
-	
+
 	/*
 	group ab_group :
-		ElementA
-		ElementB
-		ElementD
+	    ElementA
+	    ElementB
+	    ElementD
 	group c_group :
-		ElementC
+	    ElementC
 	*/
 };
 //! [main]
diff --git a/doc/examples/piconfig.cpp b/doc/examples/piconfig.cpp
index fcf62c22..0c50e26d 100644
--- a/doc/examples/piconfig.cpp
+++ b/doc/examples/piconfig.cpp
@@ -1,27 +1,25 @@
 #include "pip.h"
-	
+
 
 void _() {
-
-//! [PIConfig::Entry]
-/* "example.conf"
-a = 1
-s0.a = A
-s0.b = B
-*/
-PIConfig conf("example.conf", PIIODevice::ReadOnly);
-PIConfig::Entry ce = conf.getValue("a");
-int a = ce; // a = 1
-PIString A = ce; // A = "1"
-ce = conf.getValue("s0");
-piCout << ce.childCount(); // 2
-A = ce.getValue("b"); // A = "B"
-A = conf.getValue("s0.a"); // A = "A"
-//! [PIConfig::Entry]
-//! [fullName]
-PIConfig conf("example.conf", PIIODevice::ReadOnly);
-piCout << conf.getValue("a.b.c").name(); // "c"
-piCout << conf.getValue("a.b.c").fullName(); // "a.b.c"
-//! [fullName]
-
+	//! [PIConfig::Entry]
+	/* "example.conf"
+	a = 1
+	s0.a = A
+	s0.b = B
+	*/
+	PIConfig conf("example.conf", PIIODevice::ReadOnly);
+	PIConfig::Entry ce = conf.getValue("a");
+	int a              = ce; // a = 1
+	PIString A         = ce; // A = "1"
+	ce                 = conf.getValue("s0");
+	piCout << ce.childCount(); // 2
+	A = ce.getValue("b");      // A = "B"
+	A = conf.getValue("s0.a"); // A = "A"
+	//! [PIConfig::Entry]
+	//! [fullName]
+	PIConfig conf("example.conf", PIIODevice::ReadOnly);
+	piCout << conf.getValue("a.b.c").name();     // "c"
+	piCout << conf.getValue("a.b.c").fullName(); // "a.b.c"
+	//! [fullName]
 };
diff --git a/doc/examples/picontainers.cpp b/doc/examples/picontainers.cpp
index 2fcc83d0..47f769a8 100644
--- a/doc/examples/picontainers.cpp
+++ b/doc/examples/picontainers.cpp
@@ -1,213 +1,214 @@
 #include "pip.h"
 void _() {
-	
-//! [foreach]
-PIVector<int> vec;
-vec << 1 << 2 << 3;
+	//! [foreach]
+	PIVector<int> vec;
+	vec << 1 << 2 << 3;
 
-piForeach (int & i, vec) piCout << i;
-// 1
-// 2
-// 3
+	piForeach(int & i, vec)
+		piCout << i;
+	// 1
+	// 2
+	// 3
 
-piForeach (int & i, vec) i++;
-piForeach (int & i, vec) piCout << i;
-// 2
-// 3
-// 4
-//! [foreach]
-//! [foreachC]
-PIVector<int> vec;
-vec << 1 << 2 << 3;
-piForeachC (int & i, vec)
-	cout << i << ", ";
-// 1, 2, 3, 
-piForeachC (int & i, vec)
-	i++; // ERROR! const iterator
-//! [foreachC]
-//! [foreachR]
-PIVector<int> vec;
-vec << 1 << 2 << 3;
-piForeachR (int & i, vec)
-	cout << i << ", ";
-// 3, 2, 1, 
-piForeachR (int & i, vec)
-	i++;
-piForeachR (int & i, vec)
-	cout << i << ", ";
-// 4, 3, 2, 
-//! [foreachR]
-//! [foreachCR]
-PIVector<int> vec;
-vec << 1 << 2 << 3;
-piForeachCR (int & i, vec)
-	cout << i << ", ";
-// 3, 2, 1, 
-piForeachCR (int & i, vec)
-	i++; // ERROR! const iterator
-//! [foreachCR]
+	piForeach(int & i, vec)
+		i++;
+	piForeach(int & i, vec)
+		piCout << i;
+	// 2
+	// 3
+	// 4
+	//! [foreach]
+	//! [foreachC]
+	PIVector<int> vec;
+	vec << 1 << 2 << 3;
+	piForeachC(int & i, vec)
+		cout << i << ", ";
+	// 1, 2, 3,
+	piForeachC(int & i, vec)
+		i++; // ERROR! const iterator
+	//! [foreachC]
+	//! [foreachR]
+	PIVector<int> vec;
+	vec << 1 << 2 << 3;
+	piForeachR(int & i, vec)
+		cout << i << ", ";
+	// 3, 2, 1,
+	piForeachR(int & i, vec)
+		i++;
+	piForeachR(int & i, vec)
+		cout << i << ", ";
+	// 4, 3, 2,
+	//! [foreachR]
+	//! [foreachCR]
+	PIVector<int> vec;
+	vec << 1 << 2 << 3;
+	piForeachCR(int & i, vec)
+		cout << i << ", ";
+	// 3, 2, 1,
+	piForeachCR(int & i, vec)
+		i++; // ERROR! const iterator
+	//! [foreachCR]
 
-//! [PIVector::PIVector]
-PIVector<char> vec(4u, 'p');
-piForeachC (char i, vec)
-	cout << i << ", ";
-// p, p, p, p, 
-
-piCout << PIVector<int>({1, 2, 3});
-// 1, 2, 3
-//! [PIVector::PIVector]
-//! [PIVector::at_c]
-PIVector<int> vec;
-vec << 1 << 3 << 5;
-for (int i = 0; i < vec.size_s(); ++i)
-	cout << vec.at(i) << ", ";
-// 1, 3, 5, 
-//! [PIVector::at_c]
-//! [PIVector::at]
-PIVector<int> vec;
-vec << 1 << 3 << 5;
-for (int i = 0; i < vec.size_s(); ++i)
-	vec.at(i) += 1;
-for (int i = 0; i < vec.size_s(); ++i)
-	cout << vec.at(i) << ", ";
-// 2, 4, 6, 
-//! [PIVector::at]
-//! [PIVector::()_c]
-PIVector<int> vec;
-vec << 1 << 3 << 5;
-for (int i = 0; i < vec.size_s(); ++i)
-	cout << vec[i] << ", ";
-// 1, 3, 5, 
-//! [PIVector::()_c]
-//! [PIVector::()]
-PIVector<int> vec;
-vec << 1 << 3 << 5;
-for (int i = 0; i < vec.size_s(); ++i)
-	vec[i] += 1;
-for (int i = 0; i < vec.size_s(); ++i)
-	cout << vec[i] << ", ";
-// 2, 4, 6, 
-//! [PIVector::()]
-//! [PIVector::data_c]
-PIVector<int> vec;
-vec << 1 << 3 << 5;
-int carr[3];
-// copy data from "vec" to "carr"
-memcpy(carr, vec.data(), vec.size() * sizeof(int));
-for (int i = 0; i < vec.size_s(); ++i)
-	cout << carr[i] << ", ";
-// 1, 3, 5, 
-//! [PIVector::data_c]
-//! [PIVector::data]
-PIVector<int> vec;
-vec << 1 << 3 << 5;
-int carr[2] = {12, 13};
-// copy data from "carr" to "vec" with offset
-memcpy(vec.data(1), carr, 2 * sizeof(int));
-for (int i = 0; i < vec.size_s(); ++i)
-	cout << vec[i] << ", ";
-// 1, 12, 13, 
-//! [PIVector::data]
-//! [PIVector::resize]
-PIVector<int> vec;
-vec << 1 << 2;
-vec.resize(4);
-piForeachC (int & i, vec)
-	cout << i << ", ";
-// 1, 2, 0, 0, 
-vec.resize(3);
-piForeachC (int & i, vec)
-	cout << i << ", ";
-// 1, 2, 0, 
-//! [PIVector::resize]
-//! [PIVector::sort_0]
-PIVector<int> vec;
-vec << 3 << 2 << 5 << 1 << 4;
-vec.sort();
-piForeachC (int & i, vec)
-	cout << i << ", ";
-// 1, 2, 3, 4, 5, 
-//! [PIVector::sort_0]
-//! [PIVector::sort_1]
-static int mycomp(const int * v0, const int * v1) {
-	if (*v0 == *v1) return 0;
-	return *v0 < *v1 ? 1 : -1;
-}
-PIVector<int> vec;
-vec << 3 << 2 << 5 << 1 << 4;
-vec.sort(mycomp);
-piForeachC (int & i, vec)
-	cout << i << ", ";
-// 5, 4, 3, 2, 1, 
-//! [PIVector::sort_1]
-//! [PIVector::fill]
-PIVector<char> vec;
-vec << '1' << '2' << '3' << '4' << '5';
-vec.fill('0');
-piForeachC (char i, vec)
-	cout << i << ", ";
-// 0, 0, 0, 0, 0, 
-//! [PIVector::fill]
-//! [PIVector::remove_0]
-PIVector<char> vec;
-vec << '1' << '2' << '3' << '4' << '5';
-vec.remove(1);
-piForeachC (char i, vec)
-	cout << i << ", ";
-// 1, 3, 4, 5, 
-//! [PIVector::remove_0]
-//! [PIVector::remove_1]
-PIVector<char> vec;
-vec << '1' << '2' << '3' << '4' << '5';
-vec.remove(2, 2);
-piForeachC (char i, vec)
-	cout << i << ", ";
-// 1, 2, 5, 
-//! [PIVector::remove_1]
-//! [PIVector::removeOne]
-PIVector<char> vec;
-vec << '1' << '2' << '3' << '2' << '1';
-vec.removeOne('2');
-piForeachC (char i, vec)
-	cout << i << ", ";
-// 1, 3, 2, 1, 
-//! [PIVector::removeOne]
-//! [PIVector::removeAll]
-PIVector<char> vec;
-vec << '1' << '2' << '3' << '2' << '1';
-vec.removeAll('2');
-piForeachC (char i, vec)
-	cout << i << ", ";
-// 1, 3, 1, 
-//! [PIVector::removeAll]
-//! [PIVector::insert_0]
-PIVector<char> vec;
-vec << '1' << '3' << '4';
-vec.insert(1, '2');
-piForeachC (char i, vec)
-	cout << i << ", ";
-// 1, 2, 3, 4, 
-//! [PIVector::insert_0]
-//! [PIVector::insert_1]
-PIVector<char> vec, vec2;
-vec << '1' << '4' << '5';
-vec2 << '2' << '3';
-vec.insert(1, vec2);
-piForeachC (char i, vec)
-	cout << i << ", ";
-// 1, 2, 3, 4, 5, 
-//! [PIVector::insert_1]
-//! [PIVector::ostream<<]
-PIVector<char> vec;
-vec << '1' << '2' << '3' << '4' << '5';
-cout << vec << endl;
-// {1, 2, 3, 4, 5}
-//! [PIVector::ostream<<]
-//! [PIVector::PICout<<]
-PIVector<char> vec;
-vec << '1' << '2' << '3' << '4' << '5';
-piCout << vec;
-// {1, 2, 3, 4, 5}
-//! [PIVector::PICout<<]
+	//! [PIVector::PIVector]
+	PIVector<char> vec(4u, 'p');
+	piForeachC(char i, vec)
+		cout << i << ", ";
+	// p, p, p, p,
 
+	piCout << PIVector<int>({1, 2, 3});
+	// 1, 2, 3
+	//! [PIVector::PIVector]
+	//! [PIVector::at_c]
+	PIVector<int> vec;
+	vec << 1 << 3 << 5;
+	for (int i = 0; i < vec.size_s(); ++i)
+		cout << vec.at(i) << ", ";
+	// 1, 3, 5,
+	//! [PIVector::at_c]
+	//! [PIVector::at]
+	PIVector<int> vec;
+	vec << 1 << 3 << 5;
+	for (int i = 0; i < vec.size_s(); ++i)
+		vec.at(i) += 1;
+	for (int i = 0; i < vec.size_s(); ++i)
+		cout << vec.at(i) << ", ";
+	// 2, 4, 6,
+	//! [PIVector::at]
+	//! [PIVector::()_c]
+	PIVector<int> vec;
+	vec << 1 << 3 << 5;
+	for (int i = 0; i < vec.size_s(); ++i)
+		cout << vec[i] << ", ";
+	// 1, 3, 5,
+	//! [PIVector::()_c]
+	//! [PIVector::()]
+	PIVector<int> vec;
+	vec << 1 << 3 << 5;
+	for (int i = 0; i < vec.size_s(); ++i)
+		vec[i] += 1;
+	for (int i = 0; i < vec.size_s(); ++i)
+		cout << vec[i] << ", ";
+	// 2, 4, 6,
+	//! [PIVector::()]
+	//! [PIVector::data_c]
+	PIVector<int> vec;
+	vec << 1 << 3 << 5;
+	int carr[3];
+	// copy data from "vec" to "carr"
+	memcpy(carr, vec.data(), vec.size() * sizeof(int));
+	for (int i = 0; i < vec.size_s(); ++i)
+		cout << carr[i] << ", ";
+	// 1, 3, 5,
+	//! [PIVector::data_c]
+	//! [PIVector::data]
+	PIVector<int> vec;
+	vec << 1 << 3 << 5;
+	int carr[2] = {12, 13};
+	// copy data from "carr" to "vec" with offset
+	memcpy(vec.data(1), carr, 2 * sizeof(int));
+	for (int i = 0; i < vec.size_s(); ++i)
+		cout << vec[i] << ", ";
+	// 1, 12, 13,
+	//! [PIVector::data]
+	//! [PIVector::resize]
+	PIVector<int> vec;
+	vec << 1 << 2;
+	vec.resize(4);
+	piForeachC(int & i, vec)
+		cout << i << ", ";
+	// 1, 2, 0, 0,
+	vec.resize(3);
+	piForeachC(int & i, vec)
+		cout << i << ", ";
+	// 1, 2, 0,
+	//! [PIVector::resize]
+	//! [PIVector::sort_0]
+	PIVector<int> vec;
+	vec << 3 << 2 << 5 << 1 << 4;
+	vec.sort();
+	piForeachC(int & i, vec)
+		cout << i << ", ";
+	// 1, 2, 3, 4, 5,
+	//! [PIVector::sort_0]
+	//! [PIVector::sort_1]
+	static int mycomp(const int * v0, const int * v1) {
+		if (*v0 == *v1) return 0;
+		return *v0 < *v1 ? 1 : -1;
+	}
+	PIVector<int> vec;
+	vec << 3 << 2 << 5 << 1 << 4;
+	vec.sort(mycomp);
+	piForeachC(int & i, vec)
+		cout << i << ", ";
+	// 5, 4, 3, 2, 1,
+	//! [PIVector::sort_1]
+	//! [PIVector::fill]
+	PIVector<char> vec;
+	vec << '1' << '2' << '3' << '4' << '5';
+	vec.fill('0');
+	piForeachC(char i, vec)
+		cout << i << ", ";
+	// 0, 0, 0, 0, 0,
+	//! [PIVector::fill]
+	//! [PIVector::remove_0]
+	PIVector<char> vec;
+	vec << '1' << '2' << '3' << '4' << '5';
+	vec.remove(1);
+	piForeachC(char i, vec)
+		cout << i << ", ";
+	// 1, 3, 4, 5,
+	//! [PIVector::remove_0]
+	//! [PIVector::remove_1]
+	PIVector<char> vec;
+	vec << '1' << '2' << '3' << '4' << '5';
+	vec.remove(2, 2);
+	piForeachC(char i, vec)
+		cout << i << ", ";
+	// 1, 2, 5,
+	//! [PIVector::remove_1]
+	//! [PIVector::removeOne]
+	PIVector<char> vec;
+	vec << '1' << '2' << '3' << '2' << '1';
+	vec.removeOne('2');
+	piForeachC(char i, vec)
+		cout << i << ", ";
+	// 1, 3, 2, 1,
+	//! [PIVector::removeOne]
+	//! [PIVector::removeAll]
+	PIVector<char> vec;
+	vec << '1' << '2' << '3' << '2' << '1';
+	vec.removeAll('2');
+	piForeachC(char i, vec)
+		cout << i << ", ";
+	// 1, 3, 1,
+	//! [PIVector::removeAll]
+	//! [PIVector::insert_0]
+	PIVector<char> vec;
+	vec << '1' << '3' << '4';
+	vec.insert(1, '2');
+	piForeachC(char i, vec)
+		cout << i << ", ";
+	// 1, 2, 3, 4,
+	//! [PIVector::insert_0]
+	//! [PIVector::insert_1]
+	PIVector<char> vec, vec2;
+	vec << '1' << '4' << '5';
+	vec2 << '2' << '3';
+	vec.insert(1, vec2);
+	piForeachC(char i, vec)
+		cout << i << ", ";
+	// 1, 2, 3, 4, 5,
+	//! [PIVector::insert_1]
+	//! [PIVector::ostream<<]
+	PIVector<char> vec;
+	vec << '1' << '2' << '3' << '4' << '5';
+	cout << vec << endl;
+	// {1, 2, 3, 4, 5}
+	//! [PIVector::ostream<<]
+	//! [PIVector::PICout<<]
+	PIVector<char> vec;
+	vec << '1' << '2' << '3' << '4' << '5';
+	piCout << vec;
+	// {1, 2, 3, 4, 5}
+	//! [PIVector::PICout<<]
 };
diff --git a/doc/examples/pievaluator.cpp b/doc/examples/pievaluator.cpp
index c834f319..3b79a585 100644
--- a/doc/examples/pievaluator.cpp
+++ b/doc/examples/pievaluator.cpp
@@ -1,31 +1,31 @@
 #include "pip.h"
 
 void _() {
-//! [main]
-PIEvaluator eval;
+	//! [main]
+	PIEvaluator eval;
 
-eval.check("2*sin(pi/2)");
+	eval.check("2*sin(pi/2)");
 
-piCout << eval.expression() << "=" << eval.evaluate().real();
-// 2*sin(pi/2) = 2
+	piCout << eval.expression() << "=" << eval.evaluate().real();
+	// 2*sin(pi/2) = 2
 
-eval.check("10x");
+	eval.check("10x");
 
-piCout << eval.error() << eval.unknownVariables();
-// Unknown variables: "x" {"x"}
+	piCout << eval.error() << eval.unknownVariables();
+	// Unknown variables: "x" {"x"}
 
-eval.setVariable("x", complexd(1, 2));
-eval.check("10x");
+	eval.setVariable("x", complexd(1, 2));
+	eval.check("10x");
 
-piCout << eval.error() << eval.unknownVariables();
-// Correct {}
+	piCout << eval.error() << eval.unknownVariables();
+	// Correct {}
 
-piCout << eval.expression() << "=" << eval.evaluate();
-// 10*x = (10; 20)
+	piCout << eval.expression() << "=" << eval.evaluate();
+	// 10*x = (10; 20)
 
-eval.setVariable("x", complexd(-2, 0));
+	eval.setVariable("x", complexd(-2, 0));
 
-piCout << eval.expression() << "=" << eval.evaluate();
-// 10*x = (-20; 0)
-//! [main]
+	piCout << eval.expression() << "=" << eval.evaluate();
+	// 10*x = (-20; 0)
+	//! [main]
 };
diff --git a/doc/examples/piincludes.cpp b/doc/examples/piincludes.cpp
index a312fa2c..6e13f0c4 100644
--- a/doc/examples/piincludes.cpp
+++ b/doc/examples/piincludes.cpp
@@ -1,55 +1,57 @@
 #include "pip.h"
 void _() {
-	
-//! [swap]
-int v1 = 1, v2 = 2;
-piCout << v1 << v2; // 1 2
-piSwap<int>(v1, v2);
-piCout << v1 << v2; // 2 1
-//! [swap]
-//! [round]
-piCout << piRoundf(0.6f) << piRoundd(0.2); // 1 0
-piCout << piRoundf(-0.6f) << piRoundd(-0.2); // -1 0
-//! [round]
-//! [floor]
-piCout << piFloorf(0.6f) << piFloorf(0.2); // 0 0
-piCout << piFloorf(-0.6f) << piFloorf(-0.2f); // -1 -1
-//! [floor]
-//! [ceil]
-piCout << piCeilf(0.6f) << piCeilf(0.2); // 1 1
-piCout << piCeilf(-0.6f) << piCeilf(-0.2f); // 0 0
-//! [ceil]
-//! [abs]
-piCout << piAbsi(5) << piAbsi(-11); // 5 11
-piCout << piAbsf(-0.6f) << piAbsf(-0.2f); // 0.6 0.2
-//! [abs]
-//! [min2]
-piCout << piMini(5, 1); // 1
-piCout << piMinf(-0.6f, -0.2f); // -0.6
-//! [min2]
-//! [min3]
-piCout << piMini(5, 1, -1); // -1
-piCout << piMinf(-0.6f, -0.2f, 1.f); // -0.6
-//! [min3]
-//! [max2]
-piCout << piMaxi(5, 1); // 5
-piCout << piMaxf(-0.6f, -0.2f); // -0.2
-//! [max2]
-//! [max3]
-piCout << piMaxi(5, 1, -1); // 5
-piCout << piMaxf(-0.6f, -0.2f, 1.f); // 1
-//! [max3]
-//! [clamp]
-piCout << piClampf(-5, -3, 2); // -3
-piCout << piClampf(1, -3, 2); // 1
-piCout << piClampf(5, -3, 2); // 2
-//! [clamp]
-//! [flags]
-enum TestEnum {First = 0x1, Second = 0x2, Third = 0x4};
-PIFlags<TestEnum> testFlags(First);
-testFlags |= Third;
-piCout << testFlags[First] << testFlags[Second] << testFlags[Third]; // 1 0 1
-piCout << (int)testFlags; // 5
-//! [flags]
-
+	//! [swap]
+	int v1 = 1, v2 = 2;
+	piCout << v1 << v2; // 1 2
+	piSwap<int>(v1, v2);
+	piCout << v1 << v2; // 2 1
+	//! [swap]
+	//! [round]
+	piCout << piRoundf(0.6f) << piRoundd(0.2);   // 1 0
+	piCout << piRoundf(-0.6f) << piRoundd(-0.2); // -1 0
+	//! [round]
+	//! [floor]
+	piCout << piFloorf(0.6f) << piFloorf(0.2);    // 0 0
+	piCout << piFloorf(-0.6f) << piFloorf(-0.2f); // -1 -1
+	//! [floor]
+	//! [ceil]
+	piCout << piCeilf(0.6f) << piCeilf(0.2);    // 1 1
+	piCout << piCeilf(-0.6f) << piCeilf(-0.2f); // 0 0
+	//! [ceil]
+	//! [abs]
+	piCout << piAbsi(5) << piAbsi(-11);       // 5 11
+	piCout << piAbsf(-0.6f) << piAbsf(-0.2f); // 0.6 0.2
+	//! [abs]
+	//! [min2]
+	piCout << piMini(5, 1);         // 1
+	piCout << piMinf(-0.6f, -0.2f); // -0.6
+	//! [min2]
+	//! [min3]
+	piCout << piMini(5, 1, -1);          // -1
+	piCout << piMinf(-0.6f, -0.2f, 1.f); // -0.6
+	//! [min3]
+	//! [max2]
+	piCout << piMaxi(5, 1);         // 5
+	piCout << piMaxf(-0.6f, -0.2f); // -0.2
+	//! [max2]
+	//! [max3]
+	piCout << piMaxi(5, 1, -1);          // 5
+	piCout << piMaxf(-0.6f, -0.2f, 1.f); // 1
+	//! [max3]
+	//! [clamp]
+	piCout << piClampf(-5, -3, 2); // -3
+	piCout << piClampf(1, -3, 2);  // 1
+	piCout << piClampf(5, -3, 2);  // 2
+	//! [clamp]
+	//! [flags]
+	enum TestEnum {
+		First  = 0x1,
+		Second = 0x2,
+		Third  = 0x4
+	};
+	PIFlags<TestEnum> testFlags(First);
+	testFlags |= Third;
+	piCout << testFlags[First] << testFlags[Second] << testFlags[Third]; // 1 0 1
+	piCout << (int)testFlags;                                            // 5
+	//! [flags]
 };
diff --git a/doc/examples/piiodevice.cpp b/doc/examples/piiodevice.cpp
index 0f2e85cc..fbcb2840 100644
--- a/doc/examples/piiodevice.cpp
+++ b/doc/examples/piiodevice.cpp
@@ -1,52 +1,49 @@
 #include "pip.h"
 void _() {
-	
-//! [0]
-class SomeIO: public PIIODevice {
-	PIIODEVICE(SomeIO, "myio")
-public:
-	SomeIO(): PIIODevice() {}
-protected:
-	bool openDevice() override {
-		// open your device here
-		return if_success;
-	}
-	ssize_t readDevice(void * read_to, ssize_t max_size) override {
-		// read from your device here
-		return readed_bytes;
-	}
-	ssize_t writeDevice(const void * data, ssize_t max_size) override {
-		// write to your device here
-		return written_bytes;
-	}
-	void configureFromFullPathDevice(const PIString & full_path) override {
-		// parse full_path and configure device here
-	}
-};
-REGISTER_DEVICE(SomeIO)
-//! [0]
-//! [configure]
-// file example.conf
-dev.reopenEnabled = false
-dev.device = /dev/ttyS0
-dev.speed = 9600
-// end example.conf
-// code
-PISerial ser;
-ser.configure("example.conf", "dev");
-//! [configure]
-//! [configureDevice]
-class SomeIO: public PIIODevice {
-	...
-	bool configureDevice(const void * e_main, const void * e_parent) override {
-		PIConfig::Entry * em = (PIConfig::Entry * )e_main;
-		PIConfig::Entry * ep = (PIConfig::Entry * )e_parent;
-		setStringParam(readDeviceSetting<PIString>("stringParam", stringParam(), em, ep));
-		setIntParam(readDeviceSetting<int>("intParam", intParam(), em, ep));
-		return true;
-	}
-	...
-};
-//! [configureDevice]
+	//! [0]
+	class SomeIO: public PIIODevice {
+		PIIODEVICE(SomeIO, "myio")
 
+	public:
+		SomeIO(): PIIODevice() {}
+
+	protected:
+		bool openDevice() override {
+			// open your device here
+			return if_success;
+		}
+		ssize_t readDevice(void * read_to, ssize_t max_size) override {
+			// read from your device here
+			return readed_bytes;
+		}
+		ssize_t writeDevice(const void * data, ssize_t max_size) override {
+			// write to your device here
+			return written_bytes;
+		}
+		void configureFromFullPathDevice(const PIString & full_path) override {
+			// parse full_path and configure device here
+		}
+	};
+	REGISTER_DEVICE(SomeIO)
+	//! [0]
+	//! [configure]
+	// file example.conf
+	dev.reopenEnabled = false dev.device = / dev / ttyS0 dev.speed = 9600
+		// end example.conf
+	    // code
+		PISerial ser;
+	ser.configure("example.conf", "dev");
+	//! [configure]
+	//! [configureDevice]
+	class SomeIO: public PIIODevice {
+		... bool configureDevice(const void * e_main, const void * e_parent) override {
+			PIConfig::Entry * em = (PIConfig::Entry *)e_main;
+			PIConfig::Entry * ep = (PIConfig::Entry *)e_parent;
+			setStringParam(readDeviceSetting<PIString>("stringParam", stringParam(), em, ep));
+			setIntParam(readDeviceSetting<int>("intParam", intParam(), em, ep));
+			return true;
+		}
+		...
+	};
+	//! [configureDevice]
 };
diff --git a/doc/examples/pikbdlistener.cpp b/doc/examples/pikbdlistener.cpp
index f095a19a..7c8d3974 100644
--- a/doc/examples/pikbdlistener.cpp
+++ b/doc/examples/pikbdlistener.cpp
@@ -1,7 +1,7 @@
 #include "pip.h"
 
 //! [main]
-void key_event(char key, void * ) {
+void key_event(char key, void *) {
 	piCout << "key" << key << "pressed";
 }
 int main(int argc, char ** argv) {
@@ -13,5 +13,4 @@ int main(int argc, char ** argv) {
 }
 //! [main]
 
-void _() {
-};
+void _() {};
diff --git a/doc/examples/pimutex.cpp b/doc/examples/pimutex.cpp
index bb78f95c..fb9ddb56 100644
--- a/doc/examples/pimutex.cpp
+++ b/doc/examples/pimutex.cpp
@@ -1,6 +1,6 @@
 #include "pip.h"
 
 void _() {
-//! [main]
-//! [main]
+	//! [main]
+	//! [main]
 }
diff --git a/doc/examples/piobject.cpp b/doc/examples/piobject.cpp
index 36e4ef11..2cb73b4c 100644
--- a/doc/examples/piobject.cpp
+++ b/doc/examples/piobject.cpp
@@ -3,34 +3,36 @@
 //! [main]
 class ObjectA: public PIObject {
 	PIOBJECT(ObjectA)
+
 public:
-	EVENT_HANDLER1(void, handlerA, const PIString & , str) {piCoutObj << "handler A:" << str;}
-	EVENT1(eventA1, const PIString & , str);
+	EVENT_HANDLER1(void, handlerA, const PIString &, str) { piCoutObj << "handler A:" << str; }
+	EVENT1(eventA1, const PIString &, str);
 	EVENT2(eventA2, int, i, float, f);
 };
 
 class ObjectB: public PIObject {
 	PIOBJECT(ObjectB)
+
 public:
-	EVENT_HANDLER2(void, handlerB, int, i, float, f) {piCoutObj << "handler B:" << i << "," << f;}
+	EVENT_HANDLER2(void, handlerB, int, i, float, f) { piCoutObj << "handler B:" << i << "," << f; }
 	EVENT1(eventB, PIString, str);
 };
 
 int main(int argc, char * argv[]) {
 	ObjectA obj_a;
 	ObjectB obj_b;
-	
+
 	CONNECT2(void, int, float, &obj_a, eventA2, &obj_b, handlerB);
 	obj_a.eventA2(2, 0.5);
-	
+
 	CONNECT1(void, PIString, &obj_b, eventB, &obj_a, handlerA);
 	obj_b.eventB("event to handler");
-	
+
 	CONNECTU(&obj_a, eventA1, &obj_b, eventB);
 	obj_a.eventA1("event to event");
 
 	obj_a.piDisconnect("eventA1");
-	CONNECTL(&obj_a, eventA1, ([](const PIString & str){piCout << str;}));
+	CONNECTL(&obj_a, eventA1, ([](const PIString & str) { piCout << str; }));
 	obj_a.eventA1("event to lambda");
 };
 //! [main]
diff --git a/doc/examples/piparsehelper.cpp b/doc/examples/piparsehelper.cpp
index f8f5be8a..d6352ba5 100644
--- a/doc/examples/piparsehelper.cpp
+++ b/doc/examples/piparsehelper.cpp
@@ -7,22 +7,25 @@ enum Header {
 	hVoid
 };
 
-class MyObj: public PIObject, public PIParseHelper<uchar> {
+class MyObj
+	: public PIObject
+	, public PIParseHelper<uchar> {
 	PIOBJECT(MyObj);
+
 public:
 	MyObj(): PIParseHelper<uchar>(this) {
 		// Keys with 1 argument
-		assign(hInt, std::function<void(int)>([this](int i){piCout << "lambda type Int" << i;}));
+		assign(hInt, std::function<void(int)>([this](int i) { piCout << "lambda type Int" << i; }));
 		assign(hInt, HANDLER(methodI));
 		assign(hString, HANDLER(methodS));
 
 		// hVoid key, without arguments
-		assign(hVoid, [](){piCout << "type void";});
+		assign(hVoid, []() { piCout << "type void"; });
 		assign(hVoid, HANDLER(method));
 	}
-	EVENT_HANDLER1(void, methodI, int, i) {piCout << "methodI" << i;}
-	EVENT_HANDLER1(void, methodS, PIString, s) {piCout << "methodS" << s;}
-	EVENT_HANDLER0(void, method) {piCout << "method";}
+	EVENT_HANDLER1(void, methodI, int, i) { piCout << "methodI" << i; }
+	EVENT_HANDLER1(void, methodS, PIString, s) { piCout << "methodS" << s; }
+	EVENT_HANDLER0(void, method) { piCout << "method"; }
 };
 
 int main() {
@@ -58,10 +61,11 @@ enum Header {
 
 class MyObj: public PIObject {
 	PIOBJECT(MyObj);
+
 public:
-	EVENT_HANDLER1(void, methodI, int, i) {piCout << "methodI" << i;}
-	EVENT_HANDLER1(void, methodS, PIString, s) {piCout << "methodS" << s;}
-	EVENT_HANDLER0(void, method) {piCout << "method";}
+	EVENT_HANDLER1(void, methodI, int, i) { piCout << "methodI" << i; }
+	EVENT_HANDLER1(void, methodS, PIString, s) { piCout << "methodS" << s; }
+	EVENT_HANDLER0(void, method) { piCout << "method"; }
 };
 
 int main() {
diff --git a/doc/examples/pistatemachine.cpp b/doc/examples/pistatemachine.cpp
index f7d2dda3..f744cc56 100644
--- a/doc/examples/pistatemachine.cpp
+++ b/doc/examples/pistatemachine.cpp
@@ -1,10 +1,17 @@
 //! [main]
 #include "pip.h"
 
-enum Mode {Start, Manual, Auto, Finish, End};
+enum Mode {
+	Start,
+	Manual,
+	Auto,
+	Finish,
+	End
+};
 
 class Machine: public PIStateMachine<Mode> {
 	PIOBJECT_SUBCLASS(Machine, PIObject)
+
 public:
 	Machine() {
 		addState(Start, "start", HANDLER(startFunc));
@@ -12,7 +19,7 @@ public:
 		addState(Auto, "auto", HANDLER(autoFunc));
 		addState(Finish, "finish", HANDLER(finishFunc));
 		addState(End, "end", HANDLER(endFunc));
-		
+
 		addRule(Start, Manual, "init_ok", HANDLER(beginManualFunc));
 		addRule(Start, Auto, "init_ok", HANDLER(beginAutoFunc));
 		addRule(Manual, Auto, HANDLER(manualToAutoFunc));
@@ -23,35 +30,31 @@ public:
 		r.addCondition("finish_0_ok");
 		r.addCondition("finish_1_ok", 2);
 		addRule(r);
-		
+
 		setInitialState(Start);
-		
-		CONNECT2(void, void*, int, &timer, timeout, this, tick);
+
+		CONNECT2(void, void *, int, &timer, timeout, this, tick);
 		timer.start(500);
 	}
-	virtual void execution(const State & state) {
-		piCout << "performed conditions:" << currentConditions();
-	}
-	virtual void transition(const State & from, const State & to) {
-		piCout << "switch from" << from.name << "to" << to.name << "state";
-	}
-	
-	EVENT_HANDLER(void, startFunc) {piCout << "start function";}
-	EVENT_HANDLER(void, manualFunc) {piCout << "manual function";}
-	EVENT_HANDLER(void, autoFunc) {piCout << "auto function";}
-	EVENT_HANDLER(void, finishFunc) {piCout << "finish function";}
-	EVENT_HANDLER(void, endFunc) {piCout << "end function";}
-	EVENT_HANDLER(void, beginManualFunc) {piCout << "begin manual function";}
-	EVENT_HANDLER(void, beginAutoFunc) {piCout << "begin auto function";}
-	EVENT_HANDLER(void, autoToManualFunc) {piCout << "switch from auto to manual function";}
-	EVENT_HANDLER(void, manualToAutoFunc) {piCout << "switch from manual to auto function";}
-	
+	virtual void execution(const State & state) { piCout << "performed conditions:" << currentConditions(); }
+	virtual void transition(const State & from, const State & to) { piCout << "switch from" << from.name << "to" << to.name << "state"; }
+
+	EVENT_HANDLER(void, startFunc) { piCout << "start function"; }
+	EVENT_HANDLER(void, manualFunc) { piCout << "manual function"; }
+	EVENT_HANDLER(void, autoFunc) { piCout << "auto function"; }
+	EVENT_HANDLER(void, finishFunc) { piCout << "finish function"; }
+	EVENT_HANDLER(void, endFunc) { piCout << "end function"; }
+	EVENT_HANDLER(void, beginManualFunc) { piCout << "begin manual function"; }
+	EVENT_HANDLER(void, beginAutoFunc) { piCout << "begin auto function"; }
+	EVENT_HANDLER(void, autoToManualFunc) { piCout << "switch from auto to manual function"; }
+	EVENT_HANDLER(void, manualToAutoFunc) { piCout << "switch from manual to auto function"; }
+
 	PITimer timer;
 };
 
 Machine machine;
 
-void key_event(char key, void*) {
+void key_event(char key, void *) {
 	switch (key) {
 	case 's': machine.switchToState(Start); break;
 	case 'm': machine.switchToState(Manual); break;
diff --git a/doc/examples/pitimer.cpp b/doc/examples/pitimer.cpp
index 18c745a0..5241d290 100644
--- a/doc/examples/pitimer.cpp
+++ b/doc/examples/pitimer.cpp
@@ -60,7 +60,7 @@ int main() {
 };
 //! [system_time]
 
-void _(){
+void _() {
 
 
 };
diff --git a/libs/cloud/picloudtcp.cpp b/libs/cloud/picloudtcp.cpp
index e64d177c..445a8d75 100644
--- a/libs/cloud/picloudtcp.cpp
+++ b/libs/cloud/picloudtcp.cpp
@@ -135,8 +135,7 @@ PIPair<PICloud::TCP::Type, PICloud::TCP::Role> PICloud::TCP::parseHeader(PIByteA
 	PICloud::TCP::Header hdr;
 	ba >> hdr;
 	if (hdr.version != header.version) {
-		piCout << "[PICloud]"
-			   << "Invalid PICloud::TCP version!"_tr("PICloud");
+		piCout << "[PICloud]" << "Invalid PICloud::TCP version!"_tr("PICloud");
 		return ret;
 	}
 	ret.first  = (Type)hdr.type;
diff --git a/libs/compress/picompress.cpp b/libs/compress/picompress.cpp
index b52eaa3d..2dfe1fb8 100644
--- a/libs/compress/picompress.cpp
+++ b/libs/compress/picompress.cpp
@@ -40,8 +40,7 @@ PIByteArray piCompress(const PIByteArray & ba, int level) {
 	ulong sz = zba.size();
 	ret      = compress2(zba.data(), &sz, ba.data(), ba.size(), level);
 	if (ret != Z_OK) {
-		piCout << "[PICompress]"
-			   << "Error: invalid input or not enought memory"_tr("PICompress");
+		piCout << "[PICompress]" << "Error: invalid input or not enought memory"_tr("PICompress");
 		return ba;
 	}
 	zba.resize(sz);
@@ -59,8 +58,7 @@ PIByteArray piDecompress(const PIByteArray & zba) {
 #ifdef PIP_COMPRESS
 	ullong sz = 0;
 	if (zba.size() < sizeof(ullong)) {
-		piCout << "[PICompress]"
-			   << "Error: invalid input"_tr("PICompress");
+		piCout << "[PICompress]" << "Error: invalid input"_tr("PICompress");
 		return zba;
 	}
 	PIByteArray ba(zba.data(zba.size() - sizeof(ullong)), sizeof(ullong));
@@ -70,8 +68,7 @@ PIByteArray piDecompress(const PIByteArray & zba) {
 	ulong s = sz;
 	ret     = uncompress(ba.data(), &s, zba.data(), zba.size() - sizeof(ullong));
 	if (ret != Z_OK) {
-		piCout << "[PICompress]"
-			   << "Error: invalid input or not enought memory"_tr("PICompress");
+		piCout << "[PICompress]" << "Error: invalid input or not enought memory"_tr("PICompress");
 		return zba;
 	}
 	return ba;
diff --git a/libs/console/piscreendrawer.cpp b/libs/console/piscreendrawer.cpp
index 18d65d44..0d925bb3 100644
--- a/libs/console/piscreendrawer.cpp
+++ b/libs/console/piscreendrawer.cpp
@@ -20,74 +20,74 @@
 #include "piscreendrawer.h"
 
 // comment for use ascii instead of unicode symbols
-#  define USE_UNICODE
+#define USE_UNICODE
 
 using namespace PIScreenTypes;
 
 
 PIScreenDrawer::PIScreenDrawer(PIVector<PIVector<Cell>> & c): cells(c) {
 	arts_[LineVertical] =
-#  ifdef USE_UNICODE
+#ifdef USE_UNICODE
 		PIChar::fromUTF8("│");
-#  else
+#else
 		PIChar('|');
-#  endif
+#endif
 
 	arts_[LineHorizontal] =
-#  ifdef USE_UNICODE
+#ifdef USE_UNICODE
 		PIChar::fromUTF8("─");
-#  else
+#else
 		PIChar('-');
-#  endif
+#endif
 
 	arts_[Cross] =
-#  ifdef USE_UNICODE
+#ifdef USE_UNICODE
 		PIChar::fromUTF8("┼");
-#  else
+#else
 		PIChar('+');
-#  endif
+#endif
 
 	arts_[CornerTopLeft] =
-#  ifdef USE_UNICODE
+#ifdef USE_UNICODE
 		PIChar::fromUTF8("┌");
-#  else
+#else
 		PIChar('+');
-#  endif
+#endif
 
 	arts_[CornerTopRight] =
-#  ifdef USE_UNICODE
+#ifdef USE_UNICODE
 		PIChar::fromUTF8("┐");
-#  else
+#else
 		PIChar('+');
-#  endif
+#endif
 
 	arts_[CornerBottomLeft] =
-#  ifdef USE_UNICODE
+#ifdef USE_UNICODE
 		PIChar::fromUTF8("└");
-#  else
+#else
 		PIChar('+');
-#  endif
+#endif
 
 	arts_[CornerBottomRight] =
-#  ifdef USE_UNICODE
+#ifdef USE_UNICODE
 		PIChar::fromUTF8("┘");
-#  else
+#else
 		PIChar('+');
-#  endif
+#endif
 
 	arts_[Unchecked] =
-#  ifdef USE_UNICODE
+#ifdef USE_UNICODE
 		PIChar::fromUTF8("☐");
-#  else
+#else
 		PIChar('O');
-#  endif
+#endif
 
 	arts_[Checked] =
-#  ifdef USE_UNICODE
+#ifdef USE_UNICODE
 		PIChar::fromUTF8("☑");
-#  else
+#else
 		PIChar('0');
-#  endif
+#endif
 }
 
 
diff --git a/libs/console/piterminal.cpp b/libs/console/piterminal.cpp
index c767f708..3abcf3ae 100644
--- a/libs/console/piterminal.cpp
+++ b/libs/console/piterminal.cpp
@@ -348,8 +348,8 @@ void PITerminal::getCursor(int & x, int & y) {
 	int sz = 0;
 	PRIVATE->shm->read(&sz, 4);
 #  else
-	x                   = PRIVATE->cur_x;
-	y                   = PRIVATE->cur_y;
+	x = PRIVATE->cur_x;
+	y = PRIVATE->cur_y;
 #  endif
 }
 
@@ -980,5 +980,3 @@ bool PITerminal::resize(int cols, int rows) {
 }
 
 #endif // PIP_HAS_PROCESS
-
-
diff --git a/libs/crypt/picrypt.cpp b/libs/crypt/picrypt.cpp
index 63b65efe..c2a22d67 100644
--- a/libs/crypt/picrypt.cpp
+++ b/libs/crypt/picrypt.cpp
@@ -32,8 +32,7 @@ constexpr int hash_def_key_size = 9;
 
 PICrypt::PICrypt() {
 	if (!init()) {
-		piCout << "[PICrypt]"
-			   << "Error while initialize sodium!"_tr("PICrypt");
+		piCout << "[PICrypt]" << "Error while initialize sodium!"_tr("PICrypt");
 	}
 	nonce_.resize(crypto_secretbox_NONCEBYTES);
 	key_.resize(crypto_secretbox_KEYBYTES);
@@ -183,9 +182,7 @@ ullong PICrypt::shorthash(const PIString & s, PIByteArray key) {
 		key.fill(0);
 		return hash;
 	}
-	if (crypto_shorthash_BYTES != sizeof(hash))
-		piCout << "[PICrypt]"
-			   << "internal error: bad hash size"_tr("PICrypt");
+	if (crypto_shorthash_BYTES != sizeof(hash)) piCout << "[PICrypt]" << "internal error: bad hash size"_tr("PICrypt");
 	if (key.size() != crypto_shorthash_KEYBYTES) {
 		piCout << "[PICrypt]"
 			   << "invalid key size %1, should be %2, filled with zeros"_tr("PICrypt").arg(key.size()).arg(crypto_shorthash_KEYBYTES);
diff --git a/libs/http_server/microhttpd_server_p.cpp b/libs/http_server/microhttpd_server_p.cpp
index c5306139..38626b81 100644
--- a/libs/http_server/microhttpd_server_p.cpp
+++ b/libs/http_server/microhttpd_server_p.cpp
@@ -68,8 +68,8 @@ bool MicrohttpdServerConnection::checkBasicAuth() {
 	}
 	// piCout << "miss authorization";
 	sendReply(MessageMutable::fromCode(Code::Unauthorized)
-				  .addHeader(Header::WWWAuthenticate, "Basic realm=\"%1\", charset=\"UTF-8\""_a.arg(server->realm))
-				  .setBody(PIByteArray::fromAscii("Authorization required")));
+	              .addHeader(Header::WWWAuthenticate, "Basic realm=\"%1\", charset=\"UTF-8\""_a.arg(server->realm))
+	              .setBody(PIByteArray::fromAscii("Authorization required")));
 	// piCout << "answer sent";
 	return false;
 }
@@ -226,9 +226,7 @@ int answer_callback(void * cls,
 		m = Method::Patch;
 
 	if (m == Method::Unknown) {
-		piCout << "[MicrohttpdServer]"
-			   << "Warning:"
-			   << "Unknown method!";
+		piCout << "[MicrohttpdServer]" << "Warning:" << "Unknown method!";
 		return MHD_NO;
 	}
 
@@ -329,14 +327,14 @@ bool MicrohttpdServer::listen(PINetworkAddress addr) {
 	}
 	options.append({MHD_OPTION_END, 0, nullptr});
 	PRIVATE->daemon = MHD_start_daemon(flags,
-									   addr.port(),
-									   nullptr,
-									   nullptr,
-									   (MHD_AccessHandlerCallback)answer_callback,
-									   this,
-									   MHD_OPTION_ARRAY,
-									   options.data(),
-									   MHD_OPTION_END);
+	                                   addr.port(),
+	                                   nullptr,
+	                                   nullptr,
+	                                   (MHD_AccessHandlerCallback)answer_callback,
+	                                   this,
+	                                   MHD_OPTION_ARRAY,
+	                                   options.data(),
+	                                   MHD_OPTION_END);
 	return isListen();
 }
 
diff --git a/libs/io_utils/piethutilbase.cpp b/libs/io_utils/piethutilbase.cpp
index 50cfd04b..eac1ffb3 100644
--- a/libs/io_utils/piethutilbase.cpp
+++ b/libs/io_utils/piethutilbase.cpp
@@ -21,10 +21,10 @@
 
 #ifdef PIP_HAS_SOCKET
 
-#include "pitranslator.h"
-#ifdef PIP_CRYPT
-#  include "picrypt.h"
-#endif
+#  include "pitranslator.h"
+#  ifdef PIP_CRYPT
+#	include "picrypt.h"
+#  endif
 
 /** \class PIEthUtilBase
  * \brief Base class for ethernet utils
@@ -85,13 +85,12 @@ void PIEthUtilBase::setCryptKey(const PIByteArray & k) {
 
 
 void PIEthUtilBase::createCryptKey(const PIString & k) {
-#ifdef PIP_CRYPT
+#  ifdef PIP_CRYPT
 	_key = PICrypt::hash("sodium_bug");
 	_key = PICrypt::hash(k);
-#else
-	piCout << "[PIEthUtilBase]"
-		   << "PICrypt wasn`t built!"_tr("PIEthUtilBase");
-#endif
+#  else
+	piCout << "[PIEthUtilBase]" << "PICrypt wasn`t built!"_tr("PIEthUtilBase");
+#  endif
 	_crypt = true;
 }
 
@@ -104,32 +103,32 @@ PIByteArray PIEthUtilBase::cryptKey() const {
 PIByteArray PIEthUtilBase::cryptData(const PIByteArray & data) {
 	if (!_crypt) return data;
 	return
-#ifdef PIP_CRYPT
+#  ifdef PIP_CRYPT
 		PICrypt::crypt(data, _key);
-#else
+#  else
 		PIByteArray();
-#endif
+#  endif
 }
 
 
 PIByteArray PIEthUtilBase::decryptData(const PIByteArray & data) {
 	if (!_crypt) return data;
-#ifdef PIP_CRYPT
+#  ifdef PIP_CRYPT
 	bool ok         = false;
 	PIByteArray ret = PICrypt::decrypt(data, _key, &ok);
 	if (!ok) return PIByteArray();
 	return ret;
-#else
+#  else
 	return PIByteArray();
-#endif
+#  endif
 }
 
 size_t PIEthUtilBase::cryptSizeAddition() {
-#ifdef PIP_CRYPT
+#  ifdef PIP_CRYPT
 	return PICrypt::sizeCrypt();
-#else
+#  else
 	return 0;
-#endif
+#  endif
 }
 
 #endif // PIP_HAS_SOCKET
diff --git a/libs/io_utils/pipackedtcp.cpp b/libs/io_utils/pipackedtcp.cpp
index b1e399ad..a00751b4 100644
--- a/libs/io_utils/pipackedtcp.cpp
+++ b/libs/io_utils/pipackedtcp.cpp
@@ -1,6 +1,6 @@
 /*
     PIP - Platform Independent Primitives
-	PIPackedTCP
+    PIPackedTCP
     Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
 
     This program is free software: you can redistribute it and/or modify
@@ -168,9 +168,9 @@ ssize_t PIPackedTCP::writeDevice(const void * data, ssize_t max_size) {
 	// piCout << m_role << "write" << eth;
 	return max_size;
 	/*if (m_role == Client) {
-		return eth->write(data, max_size);
+	    return eth->write(data, max_size);
 	} else {
-		if (client) return client->write(data, max_size);
+	    if (client) return client->write(data, max_size);
 	}*/
 }
 
diff --git a/libs/io_utils/pistreampacker.cpp b/libs/io_utils/pistreampacker.cpp
index a5f17f14..b7d9a235 100644
--- a/libs/io_utils/pistreampacker.cpp
+++ b/libs/io_utils/pistreampacker.cpp
@@ -27,9 +27,9 @@
 #include "pitranslator.h"
 
 #ifdef PIP_HAS_SOCKET
-#ifdef __GNUC__
-#  pragma GCC diagnostic pop
-#endif
+#  ifdef __GNUC__
+#	pragma GCC diagnostic pop
+#  endif
 
 /** \class PIStreamPacker
  * \brief Simple packet wrap aroud any PIIODevice
diff --git a/libs/main/application/pisystemmonitor.h b/libs/main/application/pisystemmonitor.h
index 1e17c86e..30664127 100644
--- a/libs/main/application/pisystemmonitor.h
+++ b/libs/main/application/pisystemmonitor.h
@@ -296,10 +296,8 @@ private:
 //! \~russian Оператор вывода в \a PICout
 inline PICout operator<<(PICout s, const PISystemMonitor::ThreadStats & v) {
 	s.saveAndSetControls(0);
-	s << "ThreadInfo(\"" << v.name << "\", created " << v.created << ", work " << v.work_time.toMilliseconds() << " ms"
-	  << ", kernel " << v.kernel_time.toMilliseconds() << " ms"
-	  << ", user " << v.user_time.toMilliseconds() << " ms"
-	  << ")\n";
+	s << "ThreadInfo(\"" << v.name << "\", created " << v.created << ", work " << v.work_time.toMilliseconds() << " ms" << ", kernel "
+	  << v.kernel_time.toMilliseconds() << " ms" << ", user " << v.user_time.toMilliseconds() << " ms" << ")\n";
 	s.restoreControls();
 	return s;
 }
diff --git a/libs/main/application/pitranslator_p.cpp b/libs/main/application/pitranslator_p.cpp
index 8d28a5d3..3d9b8ddc 100644
--- a/libs/main/application/pitranslator_p.cpp
+++ b/libs/main/application/pitranslator_p.cpp
@@ -1,6 +1,6 @@
 /*
     PIP - Platform Independent Primitives
-	Translation private
+    Translation private
     Ivan Pelipenko peri4ko@yandex.ru
 
     This program is free software: you can redistribute it and/or modify
diff --git a/libs/main/application/pitranslator_p.h b/libs/main/application/pitranslator_p.h
index 8479b0ae..85b12d76 100644
--- a/libs/main/application/pitranslator_p.h
+++ b/libs/main/application/pitranslator_p.h
@@ -1,6 +1,6 @@
 /*
     PIP - Platform Independent Primitives
-	Translation private
+    Translation private
     Ivan Pelipenko peri4ko@yandex.ru
 
     This program is free software: you can redistribute it and/or modify
diff --git a/libs/main/client_server/piclientserver_client_base.h b/libs/main/client_server/piclientserver_client_base.h
index e4c11b46..e8dfb1d2 100644
--- a/libs/main/client_server/piclientserver_client_base.h
+++ b/libs/main/client_server/piclientserver_client_base.h
@@ -52,12 +52,12 @@ public:
 	//! \~english Constructs a disconnected client connection object.
 	//! \~russian Создает объект клиентского соединения в отключенном состоянии.
 	ClientBase();
-	
+
 	//! \~english Destroys the client connection and releases owned resources.
 	//! \~russian Уничтожает клиентское соединение и освобождает связанные ресурсы.
 	virtual ~ClientBase();
 
-	
+
 	//! \~english Returns the underlying TCP transport object.
 	//! \~russian Возвращает базовый объект TCP-транспорта.
 	const PIEthernet * getTCP() const { return tcp; }
@@ -89,18 +89,20 @@ public:
 	PIDiagnostics::State diagnostics() const;
 
 
-	//! \~english Returns how many payload bytes of the current packet are already received (all bytes count passed in \a receivePacketStart()).
-	//! \~russian Возвращает, сколько байтов полезной нагрузки текущего пакета уже получено (общее количество передается в \a receivePacketStart()).
+	//! \~english Returns how many payload bytes of the current packet are already received (all bytes count passed in \a
+	//! receivePacketStart()).
+	//! \~russian Возвращает, сколько байтов полезной нагрузки текущего пакета уже получено (общее количество передается в \a
+	//! receivePacketStart()).
 	int receivePacketProgress() const;
 
 	//! \~english Returns the current packet framing configuration.
 	//! \~russian Возвращает текущую конфигурацию пакетирования.
 	const PIStreamPackerConfig & configuration() const { return stream.configuration(); }
-	
+
 	//! \~english Returns the current packet framing configuration for modification.
 	//! \~russian Возвращает текущую конфигурацию пакетирования для изменения.
 	PIStreamPackerConfig & configuration() { return stream.configuration(); }
-	
+
 	//! \~english Replaces the packet framing configuration.
 	//! \~russian Заменяет конфигурацию пакетирования.
 	void setConfiguration(const PIStreamPackerConfig & config) { stream.setConfiguration(config); }
diff --git a/libs/main/code/picodeparser.cpp b/libs/main/code/picodeparser.cpp
index aa7492b8..110ba603 100644
--- a/libs/main/code/picodeparser.cpp
+++ b/libs/main/code/picodeparser.cpp
@@ -202,137 +202,46 @@ void PICodeParser::clear() {
 	defines << Define(PIStringAscii("PICODE"), "") << custom_defines;
 	macros << Macro(PIStringAscii("PIOBJECT"), "", PIStringList() << "name")
 		   << Macro(PIStringAscii("PIOBJECT_PARENT"), "", PIStringList() << "parent")
-		   << Macro(PIStringAscii("PIOBJECT_SUBCLASS"),
-	                "",
-	                PIStringList() << "name"
-	                               << "parent")
+		   << Macro(PIStringAscii("PIOBJECT_SUBCLASS"), "", PIStringList() << "name" << "parent")
 		   << Macro(PIStringAscii("PIIODEVICE"), "", PIStringList() << "name")
 		   << Macro(PIStringAscii("NO_COPY_CLASS"), "", PIStringList() << "name") << Macro(PIStringAscii("PRIVATE_DECLARATION"))
 
 		   << Macro(PIStringAscii("EVENT"), "void name();", PIStringList() << "name")
 		   << Macro(PIStringAscii("EVENT0"), "void name();", PIStringList() << "name")
-		   << Macro(PIStringAscii("EVENT1"),
-	                "void name(a0 n0);",
-	                PIStringList() << "name"
-	                               << "a0"
-	                               << "n0")
-		   << Macro(PIStringAscii("EVENT2"),
-	                "void name(a0 n0, a1 n1);",
-	                PIStringList() << "name"
-	                               << "a0"
-	                               << "n0"
-	                               << "a1"
-	                               << "n1")
+		   << Macro(PIStringAscii("EVENT1"), "void name(a0 n0);", PIStringList() << "name" << "a0" << "n0")
+		   << Macro(PIStringAscii("EVENT2"), "void name(a0 n0, a1 n1);", PIStringList() << "name" << "a0" << "n0" << "a1" << "n1")
 		   << Macro(PIStringAscii("EVENT3"),
 	                "void name(a0 n0, a1 n1, a2 n2);",
-	                PIStringList() << "name"
-	                               << "a0"
-	                               << "n0"
-	                               << "a1"
-	                               << "n1"
-	                               << "a2"
-	                               << "n2")
+	                PIStringList() << "name" << "a0" << "n0" << "a1" << "n1" << "a2" << "n2")
 		   << Macro(PIStringAscii("EVENT4"),
 	                "void name(a0 n0, a1 n1, a2 n2, a3 n3);",
-	                PIStringList() << "name"
-	                               << "a0"
-	                               << "n0"
-	                               << "a1"
-	                               << "n1"
-	                               << "a2"
-	                               << "n2"
-	                               << "a3"
-	                               << "n3")
+	                PIStringList() << "name" << "a0" << "n0" << "a1" << "n1" << "a2" << "n2" << "a3" << "n3")
 
-		   << Macro(PIStringAscii("EVENT_HANDLER"),
-	                "ret name()",
-	                PIStringList() << "ret"
-	                               << "name")
-		   << Macro(PIStringAscii("EVENT_HANDLER0"),
-	                "ret name()",
-	                PIStringList() << "ret"
-	                               << "name")
-		   << Macro(PIStringAscii("EVENT_HANDLER1"),
-	                "ret name(a0 n0)",
-	                PIStringList() << "ret"
-	                               << "name"
-	                               << "a0"
-	                               << "n0")
+		   << Macro(PIStringAscii("EVENT_HANDLER"), "ret name()", PIStringList() << "ret" << "name")
+		   << Macro(PIStringAscii("EVENT_HANDLER0"), "ret name()", PIStringList() << "ret" << "name")
+		   << Macro(PIStringAscii("EVENT_HANDLER1"), "ret name(a0 n0)", PIStringList() << "ret" << "name" << "a0" << "n0")
 		   << Macro(PIStringAscii("EVENT_HANDLER2"),
 	                "ret name(a0 n0, a1 n1)",
-	                PIStringList() << "ret"
-	                               << "name"
-	                               << "a0"
-	                               << "n0"
-	                               << "a1"
-	                               << "n1")
+	                PIStringList() << "ret" << "name" << "a0" << "n0" << "a1" << "n1")
 		   << Macro(PIStringAscii("EVENT_HANDLER3"),
 	                "ret name(a0 n0, a1 n1, a2 n2)",
-	                PIStringList() << "ret"
-	                               << "name"
-	                               << "a0"
-	                               << "n0"
-	                               << "a1"
-	                               << "n1"
-	                               << "a2"
-	                               << "n2")
+	                PIStringList() << "ret" << "name" << "a0" << "n0" << "a1" << "n1" << "a2" << "n2")
 		   << Macro(PIStringAscii("EVENT_HANDLER4"),
 	                "ret name(a0 n0, a1 n1, a2 n2, a3 n3)",
-	                PIStringList() << "ret"
-	                               << "name"
-	                               << "a0"
-	                               << "n0"
-	                               << "a1"
-	                               << "n1"
-	                               << "a2"
-	                               << "n2"
-	                               << "a3"
-	                               << "n3")
+	                PIStringList() << "ret" << "name" << "a0" << "n0" << "a1" << "n1" << "a2" << "n2" << "a3" << "n3")
 
-		   << Macro(PIStringAscii("EVENT_VHANDLER"),
-	                "virtual ret name()",
-	                PIStringList() << "ret"
-	                               << "name")
-		   << Macro(PIStringAscii("EVENT_VHANDLER0"),
-	                "virtual ret name()",
-	                PIStringList() << "ret"
-	                               << "name")
-		   << Macro(PIStringAscii("EVENT_VHANDLER1"),
-	                "virtual ret name(a0 n0)",
-	                PIStringList() << "ret"
-	                               << "name"
-	                               << "a0"
-	                               << "n0")
+		   << Macro(PIStringAscii("EVENT_VHANDLER"), "virtual ret name()", PIStringList() << "ret" << "name")
+		   << Macro(PIStringAscii("EVENT_VHANDLER0"), "virtual ret name()", PIStringList() << "ret" << "name")
+		   << Macro(PIStringAscii("EVENT_VHANDLER1"), "virtual ret name(a0 n0)", PIStringList() << "ret" << "name" << "a0" << "n0")
 		   << Macro(PIStringAscii("EVENT_VHANDLER2"),
 	                "virtual ret name(a0 n0, a1 n1)",
-	                PIStringList() << "ret"
-	                               << "name"
-	                               << "a0"
-	                               << "n0"
-	                               << "a1"
-	                               << "n1")
+	                PIStringList() << "ret" << "name" << "a0" << "n0" << "a1" << "n1")
 		   << Macro(PIStringAscii("EVENT_VHANDLER3"),
 	                "virtual ret name(a0 n0, a1 n1, a2 n2)",
-	                PIStringList() << "ret"
-	                               << "name"
-	                               << "a0"
-	                               << "n0"
-	                               << "a1"
-	                               << "n1"
-	                               << "a2"
-	                               << "n2")
+	                PIStringList() << "ret" << "name" << "a0" << "n0" << "a1" << "n1" << "a2" << "n2")
 		   << Macro(PIStringAscii("EVENT_VHANDLER4"),
 	                "virtual ret name(a0 n0, a1 n1, a2 n2, a3 n3)",
-	                PIStringList() << "ret"
-	                               << "name"
-	                               << "a0"
-	                               << "n0"
-	                               << "a1"
-	                               << "n1"
-	                               << "a2"
-	                               << "n2"
-	                               << "a3"
-	                               << "n3");
+	                PIStringList() << "ret" << "name" << "a0" << "n0" << "a1" << "n1" << "a2" << "n2" << "a3" << "n3");
 }
 
 
diff --git a/libs/main/console/pikbdlistener.cpp b/libs/main/console/pikbdlistener.cpp
index 1b339db9..19a4ac4b 100644
--- a/libs/main/console/pikbdlistener.cpp
+++ b/libs/main/console/pikbdlistener.cpp
@@ -122,7 +122,7 @@ const PIKbdListener::EscSeq PIKbdListener::esc_seq[] = {
 	{"[23~", PIKbdListener::F11,        0, vt_all,   0},
 	{"O[",   PIKbdListener::F12,        0, 0,        0},
 	{"[24~", PIKbdListener::F12,        0, vt_all,   0},
- // End
+	// End
 	{0,      0,						 0, 0,        0},
 };
 void setupTerminal(bool on) {
diff --git a/libs/main/console/pikbdlistener.h b/libs/main/console/pikbdlistener.h
index b278192b..82ac6fd4 100644
--- a/libs/main/console/pikbdlistener.h
+++ b/libs/main/console/pikbdlistener.h
@@ -36,12 +36,12 @@
 //! \~\brief
 //! \~english Waits until the active listener captures the configured exit key and then stops it.
 //! \~russian Ожидает, пока активный слушатель перехватит настроенную клавишу выхода, и затем останавливает его.
-#  define WAIT_FOR_EXIT                                                                                                  \
-	while (!PIKbdListener::exiting)                                                                                      \
-	  piMSleep(PIP_MIN_MSLEEP * 5);                                                                                      \
-	if (PIKbdListener::instance()) {                                                                                     \
-	  if (!PIKbdListener::instance()->stopAndWait(PISystemTime::fromSeconds(1))) PIKbdListener::instance()->terminate(); \
-	}
+#  define WAIT_FOR_EXIT                                                                                                      \
+	  while (!PIKbdListener::exiting)                                                                                        \
+		  piMSleep(PIP_MIN_MSLEEP * 5);                                                                                      \
+	  if (PIKbdListener::instance()) {                                                                                       \
+		  if (!PIKbdListener::instance()->stopAndWait(PISystemTime::fromSeconds(1))) PIKbdListener::instance()->terminate(); \
+	  }
 
 
 //! \~\ingroup Console
diff --git a/libs/main/console/piscreentypes.h b/libs/main/console/piscreentypes.h
index 15c94fc7..586d65cc 100644
--- a/libs/main/console/piscreentypes.h
+++ b/libs/main/console/piscreentypes.h
@@ -52,7 +52,7 @@ enum Color {
 	Yellow /** \~english Yellow \~russian Желтый */,
 	White /** \~english White \~russian Белый */,
 	Transparent /** \~english Preserve the background already stored in the target cell \~russian Сохранить фон, уже записанный в целевой
-				   ячейке */
+	               ячейке */
 };
 
 //! \~english Character formatting flags.
@@ -61,7 +61,7 @@ enum CharFlag {
 	Bold      = 0x1 /** \~english Bold or bright text \~russian Жирный или яркий текст */,
 	Blink     = 0x2 /** \~english Blinking text \~russian Мигание текста */,
 	Underline = 0x4 /** \~english Underlined text \~russian Подчеркнутый текст */,
-	Inverse   = 0x08 /** \~english Inverted foreground and background \~russian Инвертированные цвета текста и фона */
+	Inverse = 0x08 /** \~english Inverted foreground and background \~russian Инвертированные цвета текста и фона */
 };
 
 //! \~english Horizontal text alignment inside a tile.
@@ -77,13 +77,13 @@ enum Alignment {
 enum SizePolicy {
 	Fixed /** \~english Keep the requested size \~russian Сохранять запрошенный размер */,
 	Preferred /** \~english Use preferred size first and share extra space after fixed tiles \~russian Сначала использовать предпочтительный
-				 размер и затем делить свободное место после фиксированных тайлов */
+	             размер и затем делить свободное место после фиксированных тайлов */
 		,
 	Expanding /** \~english Take extra space before preferred tiles when the parent can grow children \~russian Получать дополнительное
-				 пространство раньше тайлов с предпочтительным размером, если родитель может расширять дочерние элементы */
+	             пространство раньше тайлов с предпочтительным размером, если родитель может расширять дочерние элементы */
 		,
 	Ignore /** \~english Skip automatic layout; geometry must be managed manually \~russian Не участвовать в автоматической компоновке;
-			  геометрию нужно задавать вручную */
+	          геометрию нужно задавать вручную */
 };
 
 //! \~english Child layout direction.
@@ -96,16 +96,16 @@ enum Direction {
 //! \~english Focus and navigation flags for tiles.
 //! \~russian Флаги фокуса и навигации для тайлов.
 enum FocusFlag {
-	CanHasFocus            = 0x1 /** \~english Tile can receive focus \~russian Тайл может получать фокус */,
-	NextByTab              = 0x2 /** \~english Tab moves focus to the next tile \~russian Клавиша Tab переводит фокус к следующему тайлу */,
+	CanHasFocus = 0x1 /** \~english Tile can receive focus \~russian Тайл может получать фокус */,
+	NextByTab = 0x2 /** \~english Tab moves focus to the next tile \~russian Клавиша Tab переводит фокус к следующему тайлу */,
 	NextByArrowsHorizontal = 0x4 /** \~english Left and right arrows move focus \~russian Стрелки влево и вправо переводят фокус */,
-	NextByArrowsVertical   = 0x8 /** \~english Up and down arrows move focus \~russian Стрелки вверх и вниз переводят фокус */,
+	NextByArrowsVertical = 0x8 /** \~english Up and down arrows move focus \~russian Стрелки вверх и вниз переводят фокус */,
 	NextByArrowsAll /** \~english Any arrow key moves focus \~russian Любая стрелка переводит фокус */ =
 		NextByArrowsHorizontal | NextByArrowsVertical,
 	FocusOnMouse = 0x10 /** \~english Mouse press gives focus to the tile \~russian Нажатие мышью переводит фокус на тайл */,
 	FocusOnWheel = 0x20 /** \~english Mouse wheel gives focus to the tile \~russian Колесо мыши переводит фокус на тайл */,
 	FocusOnMouseOrWheel /** \~english Mouse press or wheel gives focus to the tile \~russian Нажатие мышью или колесо переводят фокус на
-						   тайл */
+	                       тайл */
 		= FocusOnMouse | FocusOnWheel
 };
 
diff --git a/libs/main/containers/pivector2d.h b/libs/main/containers/pivector2d.h
index f1cb963c..97bb71a2 100644
--- a/libs/main/containers/pivector2d.h
+++ b/libs/main/containers/pivector2d.h
@@ -1234,7 +1234,10 @@ public:
 	//! \~english The function can modify the elements.
 	//! \~russian Функция может изменять элементы.
 	//! \~\sa forEach (read-only), PIVector::forEach()
-	inline PIVector2D<T> & forEach(std::function<void(T &)> func) { mat.forEach(func); return *this; }
+	inline PIVector2D<T> & forEach(std::function<void(T &)> func) {
+		mat.forEach(func);
+		return *this;
+	}
 
 	//! \~english Applies a function to each element and returns a new 2D array of a different type.
 	//! \~russian Применяет функцию к каждому элементу и возвращает новый двумерный массив другого типа.
diff --git a/libs/main/core/pibase.h b/libs/main/core/pibase.h
index babe62ac..d2a9fc32 100644
--- a/libs/main/core/pibase.h
+++ b/libs/main/core/pibase.h
@@ -727,6 +727,7 @@ inline bool piDeleteSafety(T *& pointer) {
 //! \~russian В данном примере будет выведен "Error!" при каждом \b false возврате из функции.
 class PIP_EXPORT PIScopeExitCall {
 	NO_COPY_CLASS(PIScopeExitCall)
+
 public:
 	//! \~\brief
 	//! \~english Constructor that takes a function to execute
@@ -767,14 +768,14 @@ private:
 //! \~english Inherit from this class to make your class non-trivially copyable.
 //! \~russian Наследуйтесь от этого класса чтобы сделать свой класс нетривиально копируемым.
 struct PIP_EXPORT PINonTriviallyCopyable {
-	PINonTriviallyCopyable()                                = default;
-	PINonTriviallyCopyable(const PINonTriviallyCopyable &)  = default;
-	PINonTriviallyCopyable(PINonTriviallyCopyable &&) ;
-	PINonTriviallyCopyable & operator=(const PINonTriviallyCopyable &)  = default;
-	PINonTriviallyCopyable & operator=(PINonTriviallyCopyable &&)       = default;
-	~PINonTriviallyCopyable()                                                   = default;
+	PINonTriviallyCopyable()                               = default;
+	PINonTriviallyCopyable(const PINonTriviallyCopyable &) = default;
+	PINonTriviallyCopyable(PINonTriviallyCopyable &&);
+	PINonTriviallyCopyable & operator=(const PINonTriviallyCopyable &) = default;
+	PINonTriviallyCopyable & operator=(PINonTriviallyCopyable &&)      = default;
+	~PINonTriviallyCopyable()                                          = default;
 };
-inline PINonTriviallyCopyable::PINonTriviallyCopyable(PINonTriviallyCopyable &&)  = default;
+inline PINonTriviallyCopyable::PINonTriviallyCopyable(PINonTriviallyCopyable &&) = default;
 
 
 //! \~\brief
diff --git a/libs/main/core/picout.cpp b/libs/main/core/picout.cpp
index 11e9ab63..0c33c9ef 100644
--- a/libs/main/core/picout.cpp
+++ b/libs/main/core/picout.cpp
@@ -409,32 +409,32 @@ void PICout::writeChar(char c) {
 }
 
 
-#define PIINTCOUT(v)                                                                       \
-  {                                                                                        \
-	if (!actve_) return *this;                                                             \
-	space();                                                                               \
-	if (int_base_ == 10) {                                                                 \
-	  if (buffer_) {                                                                       \
-		(*buffer_) += PIString::fromNumber(v);                                             \
-	  } else {                                                                             \
-		if (isOutputDeviceActive(Console)) getStdStream(stream_) << (v);                   \
-		if (isOutputDeviceActive(Buffer)) PICout::__string__() += PIString::fromNumber(v); \
-	  }                                                                                    \
-	} else                                                                                 \
-	  write(PIString::fromNumber(v, int_base_));                                           \
-	return *this;                                                                          \
-  }
+#define PIINTCOUT(v)                                                                               \
+	{                                                                                              \
+		if (!actve_) return *this;                                                                 \
+		space();                                                                                   \
+		if (int_base_ == 10) {                                                                     \
+			if (buffer_) {                                                                         \
+				(*buffer_) += PIString::fromNumber(v);                                             \
+			} else {                                                                               \
+				if (isOutputDeviceActive(Console)) getStdStream(stream_) << (v);                   \
+				if (isOutputDeviceActive(Buffer)) PICout::__string__() += PIString::fromNumber(v); \
+			}                                                                                      \
+		} else                                                                                     \
+			write(PIString::fromNumber(v, int_base_));                                             \
+		return *this;                                                                              \
+	}
 
-#define PIFLOATCOUT(v)                                                                        \
-  {                                                                                           \
-	if (buffer_) {                                                                            \
-	  (*buffer_) += PIString::fromNumber(v, 'g');                                             \
-	} else {                                                                                  \
-	  if (isOutputDeviceActive(Console)) getStdStream(stream_) << (v);                        \
-	  if (isOutputDeviceActive(Buffer)) PICout::__string__() += PIString::fromNumber(v, 'g'); \
-	}                                                                                         \
-  }                                                                                           \
-  return *this;
+#define PIFLOATCOUT(v)                                                                              \
+	{                                                                                               \
+		if (buffer_) {                                                                              \
+			(*buffer_) += PIString::fromNumber(v, 'g');                                             \
+		} else {                                                                                    \
+			if (isOutputDeviceActive(Console)) getStdStream(stream_) << (v);                        \
+			if (isOutputDeviceActive(Buffer)) PICout::__string__() += PIString::fromNumber(v, 'g'); \
+		}                                                                                           \
+	}                                                                                               \
+	return *this;
 
 
 PICout & PICout::operator<<(const PIString & v) {
diff --git a/libs/main/core/picout.h b/libs/main/core/picout.h
index bbf0b566..d9ad877e 100644
--- a/libs/main/core/picout.h
+++ b/libs/main/core/picout.h
@@ -51,13 +51,13 @@
 
 #else
 #  define piCout PICout(piDebug, PICoutStdStream::StdOut)
-#  define piCoutObj                                     \
-	PICout(piDebug && debug(), PICoutStdStream::StdOut) \
-		<< (PIStringAscii("[") + className() + (name().isEmpty() ? "]" : PIStringAscii(" \"") + name() + PIStringAscii("\"]")))
+#  define piCoutObj                                       \
+	  PICout(piDebug && debug(), PICoutStdStream::StdOut) \
+		  << (PIStringAscii("[") + className() + (name().isEmpty() ? "]" : PIStringAscii(" \"") + name() + PIStringAscii("\"]")))
 #  define piCerr PICout(piDebug, PICoutStdStream::StdErr)
-#  define piCerrObj                                     \
-	PICout(piDebug && debug(), PICoutStdStream::StdErr) \
-		<< (PIStringAscii("[") + className() + (name().isEmpty() ? "]" : PIStringAscii(" \"") + name() + PIStringAscii("\"]")))
+#  define piCerrObj                                       \
+	  PICout(piDebug && debug(), PICoutStdStream::StdErr) \
+		  << (PIStringAscii("[") + className() + (name().isEmpty() ? "]" : PIStringAscii(" \"") + name() + PIStringAscii("\"]")))
 #endif
 
 
diff --git a/libs/main/core/pimemoryblock.h b/libs/main/core/pimemoryblock.h
index c416aa2e..28a37b1b 100644
--- a/libs/main/core/pimemoryblock.h
+++ b/libs/main/core/pimemoryblock.h
@@ -33,7 +33,6 @@
 #define PIMEMORYBLOCK_H
 
 
-
 //! \~\brief
 //! \~english Helper struct to store and restore custom blocks of data to/from PIBinaryStream
 //! \~russian Вспомогательная структура для сохранения и извлечения произвольных блоков данных в/из PIBinaryStream
diff --git a/libs/main/crypt/piauth.h b/libs/main/crypt/piauth.h
index dbbc8080..db313e38 100644
--- a/libs/main/crypt/piauth.h
+++ b/libs/main/crypt/piauth.h
@@ -43,13 +43,13 @@ public:
 	enum State {
 		NotConnected /** \~english No active authentication session. \~russian Активной сессии аутентификации нет. */,
 		AuthProbe /** \~english Initial probe stage with signed peer introduction. \~russian Начальный этап с подписанным представлением
-					 узла. */
+		             узла. */
 			,
 		PassRequest /** \~english Password verification stage for unknown peers. \~russian Этап проверки пароля для неизвестных узлов. */,
 		AuthReply /** \~english Reply with client authentication data. \~russian Ответ с данными аутентификации клиента. */,
 		KeyExchange /** \~english Session key exchange stage. \~russian Этап обмена сеансовым ключом. */,
 		Connected /** \~english Authentication finished and session key is established. \~russian Аутентификация завершена и сеансовый ключ
-					 установлен. */
+		             установлен. */
 	};
 
 
diff --git a/libs/main/digest/pidigest.cpp b/libs/main/digest/pidigest.cpp
index e99eea1a..9b4696fd 100644
--- a/libs/main/digest/pidigest.cpp
+++ b/libs/main/digest/pidigest.cpp
@@ -1,20 +1,20 @@
 /*
-	PIP - Platform Independent Primitives
-	Digest algorithms
-	Ivan Pelipenko peri4ko@yandex.ru
+    PIP - Platform Independent Primitives
+    Digest algorithms
+    Ivan Pelipenko peri4ko@yandex.ru
 
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
 
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pidigest.h"
diff --git a/libs/main/digest/pidigest.h b/libs/main/digest/pidigest.h
index ac315ad4..7f258a60 100644
--- a/libs/main/digest/pidigest.h
+++ b/libs/main/digest/pidigest.h
@@ -4,22 +4,22 @@
 //! \~english Digest calculation helpers
 //! \~russian Вспомогательные методы вычисления хэш-сумм
 /*
-	PIP - Platform Independent Primitives
-	Digest algorithms
-	Ivan Pelipenko peri4ko@yandex.ru
+    PIP - Platform Independent Primitives
+    Digest algorithms
+    Ivan Pelipenko peri4ko@yandex.ru
 
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
 
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef pidigest_h
diff --git a/libs/main/digest/pidigest_blake2_p.cpp b/libs/main/digest/pidigest_blake2_p.cpp
index 96866d27..1d94d169 100644
--- a/libs/main/digest/pidigest_blake2_p.cpp
+++ b/libs/main/digest/pidigest_blake2_p.cpp
@@ -1,20 +1,20 @@
 /*
-	PIP - Platform Independent Primitives
-	Digest algorithms
-	Ivan Pelipenko peri4ko@yandex.ru
+    PIP - Platform Independent Primitives
+    Digest algorithms
+    Ivan Pelipenko peri4ko@yandex.ru
 
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
 
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pidigest_blake2_p.h"
diff --git a/libs/main/digest/pidigest_blake2_p.h b/libs/main/digest/pidigest_blake2_p.h
index ab9b62b3..ce6383ad 100644
--- a/libs/main/digest/pidigest_blake2_p.h
+++ b/libs/main/digest/pidigest_blake2_p.h
@@ -1,20 +1,20 @@
 /*
-	PIP - Platform Independent Primitives
-	Digest algorithms
-	Ivan Pelipenko peri4ko@yandex.ru
+    PIP - Platform Independent Primitives
+    Digest algorithms
+    Ivan Pelipenko peri4ko@yandex.ru
 
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
 
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef pidigest_blake2_h
diff --git a/libs/main/digest/pidigest_md2_p.cpp b/libs/main/digest/pidigest_md2_p.cpp
index 1337df7d..1de8d6b3 100644
--- a/libs/main/digest/pidigest_md2_p.cpp
+++ b/libs/main/digest/pidigest_md2_p.cpp
@@ -1,20 +1,20 @@
 /*
-	PIP - Platform Independent Primitives
-	Digest algorithms
-	Ivan Pelipenko peri4ko@yandex.ru
+    PIP - Platform Independent Primitives
+    Digest algorithms
+    Ivan Pelipenko peri4ko@yandex.ru
 
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
 
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pidigest_md2_p.h"
diff --git a/libs/main/digest/pidigest_md2_p.h b/libs/main/digest/pidigest_md2_p.h
index 01c327b8..718fe197 100644
--- a/libs/main/digest/pidigest_md2_p.h
+++ b/libs/main/digest/pidigest_md2_p.h
@@ -1,20 +1,20 @@
 /*
-	PIP - Platform Independent Primitives
-	Digest algorithms
-	Ivan Pelipenko peri4ko@yandex.ru
+    PIP - Platform Independent Primitives
+    Digest algorithms
+    Ivan Pelipenko peri4ko@yandex.ru
 
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
 
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef pidigest_md2_h
diff --git a/libs/main/digest/pidigest_md4_p.cpp b/libs/main/digest/pidigest_md4_p.cpp
index 482d49e3..201a085b 100644
--- a/libs/main/digest/pidigest_md4_p.cpp
+++ b/libs/main/digest/pidigest_md4_p.cpp
@@ -1,20 +1,20 @@
 /*
-	PIP - Platform Independent Primitives
-	Digest algorithms
-	Ivan Pelipenko peri4ko@yandex.ru
+    PIP - Platform Independent Primitives
+    Digest algorithms
+    Ivan Pelipenko peri4ko@yandex.ru
 
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
 
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pidigest_md4_p.h"
diff --git a/libs/main/digest/pidigest_md4_p.h b/libs/main/digest/pidigest_md4_p.h
index 61f774d2..20bb6480 100644
--- a/libs/main/digest/pidigest_md4_p.h
+++ b/libs/main/digest/pidigest_md4_p.h
@@ -1,20 +1,20 @@
 /*
-	PIP - Platform Independent Primitives
-	Digest algorithms
-	Ivan Pelipenko peri4ko@yandex.ru
+    PIP - Platform Independent Primitives
+    Digest algorithms
+    Ivan Pelipenko peri4ko@yandex.ru
 
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
 
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef pidigest_md4_h
diff --git a/libs/main/digest/pidigest_md5_p.cpp b/libs/main/digest/pidigest_md5_p.cpp
index 182384e2..f8b204bc 100644
--- a/libs/main/digest/pidigest_md5_p.cpp
+++ b/libs/main/digest/pidigest_md5_p.cpp
@@ -1,20 +1,20 @@
 /*
-	PIP - Platform Independent Primitives
-	Digest algorithms
-	Ivan Pelipenko peri4ko@yandex.ru
+    PIP - Platform Independent Primitives
+    Digest algorithms
+    Ivan Pelipenko peri4ko@yandex.ru
 
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
 
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pidigest_md5_p.h"
@@ -36,8 +36,8 @@ PIByteArray MD5::md5(const PIByteArray & in) {
 		0xAB9423A7u, 0xFC93A039u, 0x655B59C3u, 0x8F0CCC92u, 0xFFEFF47Du, 0x85845DD1u, 0x6FA87E4Fu, 0xFE2CE6E0u, 0xA3014314u, 0x4E0811A1u,
 		0xF7537E82u, 0xBD3AF235u, 0x2AD7D2BBu, 0xEB86D391u};
 	static constexpr uint32_t s[64] = {7,  12, 17, 22, 7,  12, 17, 22, 7,  12, 17, 22, 7,  12, 17, 22, 5,  9,  14, 20, 5,  9,
-									   14, 20, 5,  9,  14, 20, 5,  9,  14, 20, 4,  11, 16, 23, 4,  11, 16, 23, 4,  11, 16, 23,
-									   4,  11, 16, 23, 6,  10, 15, 21, 6,  10, 15, 21, 6,  10, 15, 21, 6,  10, 15, 21};
+	                                   14, 20, 5,  9,  14, 20, 5,  9,  14, 20, 4,  11, 16, 23, 4,  11, 16, 23, 4,  11, 16, 23,
+	                                   4,  11, 16, 23, 6,  10, 15, 21, 6,  10, 15, 21, 6,  10, 15, 21, 6,  10, 15, 21};
 
 	uint32_t a0                     = 0x67452301u;
 	uint32_t b0                     = 0xefcdab89u;
diff --git a/libs/main/digest/pidigest_md5_p.h b/libs/main/digest/pidigest_md5_p.h
index 04fb47ba..a822e8c7 100644
--- a/libs/main/digest/pidigest_md5_p.h
+++ b/libs/main/digest/pidigest_md5_p.h
@@ -1,20 +1,20 @@
 /*
-	PIP - Platform Independent Primitives
-	Digest algorithms
-	Ivan Pelipenko peri4ko@yandex.ru
+    PIP - Platform Independent Primitives
+    Digest algorithms
+    Ivan Pelipenko peri4ko@yandex.ru
 
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
 
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef pidigest_md5_h
diff --git a/libs/main/digest/pidigest_sha1_p.cpp b/libs/main/digest/pidigest_sha1_p.cpp
index 26d267ab..7e62ebef 100644
--- a/libs/main/digest/pidigest_sha1_p.cpp
+++ b/libs/main/digest/pidigest_sha1_p.cpp
@@ -1,20 +1,20 @@
 /*
-	PIP - Platform Independent Primitives
-	Digest algorithms
-	Ivan Pelipenko peri4ko@yandex.ru
+    PIP - Platform Independent Primitives
+    Digest algorithms
+    Ivan Pelipenko peri4ko@yandex.ru
 
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
 
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pidigest_sha1_p.h"
diff --git a/libs/main/digest/pidigest_sha1_p.h b/libs/main/digest/pidigest_sha1_p.h
index 0d010b69..539b3756 100644
--- a/libs/main/digest/pidigest_sha1_p.h
+++ b/libs/main/digest/pidigest_sha1_p.h
@@ -1,20 +1,20 @@
 /*
-	PIP - Platform Independent Primitives
-	Digest algorithms
-	Ivan Pelipenko peri4ko@yandex.ru
+    PIP - Platform Independent Primitives
+    Digest algorithms
+    Ivan Pelipenko peri4ko@yandex.ru
 
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
 
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef pidigest_sha1_h
diff --git a/libs/main/digest/pidigest_sha2_p.cpp b/libs/main/digest/pidigest_sha2_p.cpp
index 39ee08c4..570362a9 100644
--- a/libs/main/digest/pidigest_sha2_p.cpp
+++ b/libs/main/digest/pidigest_sha2_p.cpp
@@ -1,20 +1,20 @@
 /*
-	PIP - Platform Independent Primitives
-	Digest algorithms
-	Ivan Pelipenko peri4ko@yandex.ru
+    PIP - Platform Independent Primitives
+    Digest algorithms
+    Ivan Pelipenko peri4ko@yandex.ru
 
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
 
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pidigest_sha2_p.h"
@@ -25,37 +25,37 @@ const uint32_t SHA2::initial_256[8] =
 	{0x6A09E667u, 0xBB67AE85u, 0x3C6EF372u, 0xA54FF53Au, 0x510E527Fu, 0x9B05688Cu, 0x1F83D9ABu, 0x5BE0CD19u};
 
 const uint64_t SHA2::initial_384[8]     = {0xCBBB9D5DC1059ED8U,
-										   0x629A292A367CD507U,
-										   0x9159015A3070DD17U,
-										   0x152FECD8F70E5939U,
-										   0x67332667FFC00B31U,
-										   0x8EB44A8768581511U,
-										   0xDB0C2E0D64F98FA7U,
-										   0x47B5481DBEFA4FA4U};
+                                           0x629A292A367CD507U,
+                                           0x9159015A3070DD17U,
+                                           0x152FECD8F70E5939U,
+                                           0x67332667FFC00B31U,
+                                           0x8EB44A8768581511U,
+                                           0xDB0C2E0D64F98FA7U,
+                                           0x47B5481DBEFA4FA4U};
 const uint64_t SHA2::initial_512[8]     = {0X6A09E667F3BCC908U,
-										   0XBB67AE8584CAA73BU,
-										   0X3C6EF372FE94F82BU,
-										   0XA54FF53A5F1D36F1U,
-										   0X510E527FADE682D1U,
-										   0X9B05688C2B3E6C1FU,
-										   0X1F83D9ABFB41BD6BU,
-										   0X5BE0CD19137E2179U};
+                                           0XBB67AE8584CAA73BU,
+                                           0X3C6EF372FE94F82BU,
+                                           0XA54FF53A5F1D36F1U,
+                                           0X510E527FADE682D1U,
+                                           0X9B05688C2B3E6C1FU,
+                                           0X1F83D9ABFB41BD6BU,
+                                           0X5BE0CD19137E2179U};
 const uint64_t SHA2::initial_512_256[8] = {0x22312194FC2BF72CU,
-										   0x9F555FA3C84C64C2U,
-										   0x2393B86B6F53B151U,
-										   0x963877195940EABDU,
-										   0x96283EE2A88EFFE3U,
-										   0xBE5E1E2553863992U,
-										   0x2B0199FC2C85B8AAU,
-										   0x0EB72DDC81C52CA2U};
+                                           0x9F555FA3C84C64C2U,
+                                           0x2393B86B6F53B151U,
+                                           0x963877195940EABDU,
+                                           0x96283EE2A88EFFE3U,
+                                           0xBE5E1E2553863992U,
+                                           0x2B0199FC2C85B8AAU,
+                                           0x0EB72DDC81C52CA2U};
 const uint64_t SHA2::initial_512_224[8] = {0x8C3D37C819544DA2U,
-										   0x73E1996689DCD4D6U,
-										   0x1DFAB7AE32FF9C82U,
-										   0x679DD514582F9FCFU,
-										   0x0F6D2B697BD44DA8U,
-										   0x77E36F7304C48942U,
-										   0x3F9D85A86A1D36C8U,
-										   0x1112E6AD91D692A1U};
+                                           0x73E1996689DCD4D6U,
+                                           0x1DFAB7AE32FF9C82U,
+                                           0x679DD514582F9FCFU,
+                                           0x0F6D2B697BD44DA8U,
+                                           0x77E36F7304C48942U,
+                                           0x3F9D85A86A1D36C8U,
+                                           0x1112E6AD91D692A1U};
 
 template<typename T>
 inline T rotate_u(T v, int bits) {
diff --git a/libs/main/digest/pidigest_sha2_p.h b/libs/main/digest/pidigest_sha2_p.h
index 37fc2dcf..c523fbe1 100644
--- a/libs/main/digest/pidigest_sha2_p.h
+++ b/libs/main/digest/pidigest_sha2_p.h
@@ -1,20 +1,20 @@
 /*
-	PIP - Platform Independent Primitives
-	Digest algorithms
-	Ivan Pelipenko peri4ko@yandex.ru
+    PIP - Platform Independent Primitives
+    Digest algorithms
+    Ivan Pelipenko peri4ko@yandex.ru
 
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
 
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef pidigest_sha2_h
diff --git a/libs/main/digest/pidigest_siphash_p.cpp b/libs/main/digest/pidigest_siphash_p.cpp
index 3c4b1de2..78ce5ed6 100644
--- a/libs/main/digest/pidigest_siphash_p.cpp
+++ b/libs/main/digest/pidigest_siphash_p.cpp
@@ -1,20 +1,20 @@
 /*
-	PIP - Platform Independent Primitives
-	Digest algorithms
-	Ivan Pelipenko peri4ko@yandex.ru
+    PIP - Platform Independent Primitives
+    Digest algorithms
+    Ivan Pelipenko peri4ko@yandex.ru
 
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
 
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pidigest_siphash_p.h"
diff --git a/libs/main/digest/pidigest_siphash_p.h b/libs/main/digest/pidigest_siphash_p.h
index 5ca14e80..664fd1e9 100644
--- a/libs/main/digest/pidigest_siphash_p.h
+++ b/libs/main/digest/pidigest_siphash_p.h
@@ -1,20 +1,20 @@
 /*
-	PIP - Platform Independent Primitives
-	Digest algorithms
-	Ivan Pelipenko peri4ko@yandex.ru
+    PIP - Platform Independent Primitives
+    Digest algorithms
+    Ivan Pelipenko peri4ko@yandex.ru
 
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
 
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef pidigest_siphash_h
diff --git a/libs/main/geo/pigeoposition.cpp b/libs/main/geo/pigeoposition.cpp
index cc77615e..a2041387 100644
--- a/libs/main/geo/pigeoposition.cpp
+++ b/libs/main/geo/pigeoposition.cpp
@@ -289,7 +289,7 @@ void PIGeoPosition::convertCartesianToGeodetic(const PIMathVectorT3d & xyz, PIMa
 	p = sqrt(xyz[0] * xyz[0] + xyz[1] * xyz[1]);
 	if (p < PIGeoPosition::position_tolerance / 5) { // pole or origin
 		llh[0] = (xyz[2] > 0.0 ? 90.0 : -90.0);
-		llh[1] = 0.0;                                // lon undefined, really
+		llh[1] = 0.0; // lon undefined, really
 		llh[2] = piAbsd(xyz[2]) - ell.a * sqrt(1.0 - ell.eccSquared());
 		return;
 	}
diff --git a/libs/main/http_client/pihttpclient.h b/libs/main/http_client/pihttpclient.h
index 7635df14..5d203bd4 100644
--- a/libs/main/http_client/pihttpclient.h
+++ b/libs/main/http_client/pihttpclient.h
@@ -4,22 +4,22 @@
 //! \~english Public HTTP client request API
 //! \~russian Публичный API HTTP-клиента для выполнения запросов
 /*
-	PIP - Platform Independent Primitives
-	Public HTTP client request API
-	Ivan Pelipenko peri4ko@yandex.ru
+    PIP - Platform Independent Primitives
+    Public HTTP client request API
+    Ivan Pelipenko peri4ko@yandex.ru
 
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
 
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef pihttpclient_h
diff --git a/libs/main/http_common/pihttpconstants.h b/libs/main/http_common/pihttpconstants.h
index fe9d8db6..d0f38829 100644
--- a/libs/main/http_common/pihttpconstants.h
+++ b/libs/main/http_common/pihttpconstants.h
@@ -8,22 +8,22 @@
 //! \~russian Предоставляет классы перечислений для HTTP методов и кодов состояния, а также пространство имён с константами имён HTTP
 //! заголовков.
 /*
-	PIP - Platform Independent Primitives
-	HTTP constants and enumerations
-	Ivan Pelipenko peri4ko@yandex.ru
+    PIP - Platform Independent Primitives
+    HTTP constants and enumerations
+    Ivan Pelipenko peri4ko@yandex.ru
 
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
 
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef pihttpconstants_h
diff --git a/libs/main/http_common/pihttptypes.h b/libs/main/http_common/pihttptypes.h
index cb8cf15e..d4d485df 100644
--- a/libs/main/http_common/pihttptypes.h
+++ b/libs/main/http_common/pihttptypes.h
@@ -4,22 +4,22 @@
 //! \~english Shared HTTP message container types
 //! \~russian Общие типы контейнеров HTTP-сообщений
 /*
-	PIP - Platform Independent Primitives
-	Shared HTTP message container types
-	Ivan Pelipenko peri4ko@yandex.ru
+    PIP - Platform Independent Primitives
+    Shared HTTP message container types
+    Ivan Pelipenko peri4ko@yandex.ru
 
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
 
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef pihttptypes_h
diff --git a/libs/main/http_common/piserverendpoint_p.h b/libs/main/http_common/piserverendpoint_p.h
index 22e4a181..d15ac377 100644
--- a/libs/main/http_common/piserverendpoint_p.h
+++ b/libs/main/http_common/piserverendpoint_p.h
@@ -4,22 +4,22 @@
 //! \~english Shared HTTP message container types
 //! \~russian Общие типы контейнеров HTTP-сообщений
 /*
-	PIP - Platform Independent Primitives
-	Shared HTTP message container types
-	Ivan Pelipenko peri4ko@yandex.ru
+    PIP - Platform Independent Primitives
+    Shared HTTP message container types
+    Ivan Pelipenko peri4ko@yandex.ru
 
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
 
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef piserverendpoint_p_h
diff --git a/libs/main/http_server/microhttpd_server.h b/libs/main/http_server/microhttpd_server.h
index fc90b321..f810295a 100644
--- a/libs/main/http_server/microhttpd_server.h
+++ b/libs/main/http_server/microhttpd_server.h
@@ -4,22 +4,22 @@
 //! \~english Base HTTP server API built on top of libmicrohttpd
 //! \~russian Базовый API HTTP-сервера, построенный поверх libmicrohttpd
 /*
-	PIP - Platform Independent Primitives
-	Base HTTP server API built on top of libmicrohttpd
-	Ivan Pelipenko peri4ko@yandex.ru
+    PIP - Platform Independent Primitives
+    Base HTTP server API built on top of libmicrohttpd
+    Ivan Pelipenko peri4ko@yandex.ru
 
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
 
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef MICROHTTPD_SERVER_P_H
@@ -51,18 +51,18 @@ public:
 	//! \~russian Параметры конфигурации сервера, принимаемые методом \a setOption().
 	enum class Option {
 		ConnectionLimit /** \~english Maximum number of simultaneously accepted connections. \~russian Максимальное число одновременно
-						   принимаемых соединений. */
+		                   принимаемых соединений. */
 			,
 		ConnectionTimeout /** \~english Per-connection timeout value. \~russian Значение таймаута для отдельного соединения. */,
 		HTTPSEnabled /** \~english Enables TLS mode for the daemon. \~russian Включает режим TLS для демона. */,
 		HTTPSMemKey /** \~english Private key stored in memory as \c PIByteArray. \~russian Приватный ключ, хранящийся в памяти в виде \c
-					   PIByteArray. */
+		               PIByteArray. */
 			,
 		HTTPSMemCert /** \~english Certificate stored in memory as \c PIByteArray. \~russian Сертификат, хранящийся в памяти в виде \c
-						PIByteArray. */
+		                PIByteArray. */
 			,
 		HTTPSKeyPassword /** \~english Password for the in-memory private key as \c PIByteArray. \~russian Пароль для приватного ключа в
-							памяти в виде \c PIByteArray. */
+		                    памяти в виде \c PIByteArray. */
 	};
 
 	//! \~english Sets a server option. The expected variant payload depends on the selected \a Option.
diff --git a/libs/main/http_server/pihttpserver.h b/libs/main/http_server/pihttpserver.h
index ca3abea1..0b46ca5d 100644
--- a/libs/main/http_server/pihttpserver.h
+++ b/libs/main/http_server/pihttpserver.h
@@ -4,22 +4,22 @@
 //! \~english High-level HTTP server with path-based routing and handler registration
 //! \~russian Высокоуровневый HTTP сервер с маршрутизацией по путям и регистрацией обработчиков
 /*
-	PIP - Platform Independent Primitives
-	High-level HTTP server implementation
-	Ivan Pelipenko peri4ko@yandex.ru
+    PIP - Platform Independent Primitives
+    High-level HTTP server implementation
+    Ivan Pelipenko peri4ko@yandex.ru
 
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
 
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef PIHTTPSERVER_H
diff --git a/libs/main/introspection/piintrospection_base.h b/libs/main/introspection/piintrospection_base.h
index b9d541ff..f1db6bf1 100644
--- a/libs/main/introspection/piintrospection_base.h
+++ b/libs/main/introspection/piintrospection_base.h
@@ -82,15 +82,15 @@ class PIIntrospectionServer;
 
 #else
 
-#ifdef PIP_INTROSPECTION
-#  define __PIINTROSPECTION_SINGLETON_H__(T) static PIIntrospection##T##Interface * instance();
+#  ifdef PIP_INTROSPECTION
+#	define __PIINTROSPECTION_SINGLETON_H__(T) static PIIntrospection##T##Interface * instance();
 
-#  define __PIINTROSPECTION_SINGLETON_CPP__(T)                                    \
-	  PIIntrospection##T##Interface * PIIntrospection##T##Interface::instance() { \
-		  static PIIntrospection##T##Interface ret;                               \
-		  return &ret;                                                            \
-	  }
-#endif // PIP_INTROSPECTION
+#	define __PIINTROSPECTION_SINGLETON_CPP__(T)                                    \
+		PIIntrospection##T##Interface * PIIntrospection##T##Interface::instance() { \
+			static PIIntrospection##T##Interface ret;                               \
+			return &ret;                                                            \
+		}
+#  endif // PIP_INTROSPECTION
 
 #endif // DOXYGEN
 #endif // PIINTROSPECTION_BASE_H
diff --git a/libs/main/introspection/piintrospection_threads_p.h b/libs/main/introspection/piintrospection_threads_p.h
index dadbb61c..fd6b6e25 100644
--- a/libs/main/introspection/piintrospection_threads_p.h
+++ b/libs/main/introspection/piintrospection_threads_p.h
@@ -24,8 +24,8 @@
 
 #ifdef PIP_INTROSPECTION
 
-#include "pimap.h"
-#include "pithread.h"
+#  include "pimap.h"
+#  include "pithread.h"
 
 
 class PIP_EXPORT PIIntrospectionThreads {
diff --git a/libs/main/io_devices/pidir.cpp b/libs/main/io_devices/pidir.cpp
index 85eb595b..d554dddf 100644
--- a/libs/main/io_devices/pidir.cpp
+++ b/libs/main/io_devices/pidir.cpp
@@ -17,35 +17,35 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifdef PIP_HAS_FILESYSTEM
-#include "pidir.h"
+#  include "pidir.h"
 
-#include "piincludes_p.h"
+#  include "piincludes_p.h"
 
 
 const PIChar PIDir::separator = '/';
-#ifdef QNX
-#  define _stat_struct_ struct stat
-#  define _stat_call_   stat
-#  define _stat_link_   lstat
-#else
-#  define _stat_struct_ struct stat64
-#  define _stat_call_   stat64
-#  define _stat_link_   lstat64
-#endif
-#ifndef WINDOWS
-#  ifdef ANDROID
-#	include <dirent.h>
+#  ifdef QNX
+#	define _stat_struct_ struct stat
+#	define _stat_call_   stat
+#	define _stat_link_   lstat
 #  else
-#	ifdef FREERTOS
+#	define _stat_struct_ struct stat64
+#	define _stat_call_   stat64
+#	define _stat_link_   lstat64
+#  endif
+#  ifndef WINDOWS
+#	ifdef ANDROID
+#	  include <dirent.h>
+#	else
+#	  ifdef FREERTOS
 extern "C" {
-#	  include <sys/dirent.h>
+#		include <sys/dirent.h>
 }
-#	else
-#	  include <sys/dir.h>
+#	  else
+#		include <sys/dir.h>
+#	  endif
 #	endif
+#	include <sys/stat.h>
 #  endif
-#  include <sys/stat.h>
-#endif
 
 
 //! \class PIDir pidir.h
@@ -80,9 +80,9 @@ bool PIDir::operator==(const PIDir & d) const {
 bool PIDir::isAbsolute() const {
 	if (path_.isEmpty()) return false;
 	if (path_[0] == separator) return true;
-#ifdef WINDOWS
+#  ifdef WINDOWS
 	return (path_.mid(1, 1) == ":");
-#endif
+#  endif
 	return false;
 }
 
@@ -96,28 +96,28 @@ PIString PIDir::name() const {
 
 
 PIString PIDir::path() const {
-#ifdef WINDOWS
+#  ifdef WINDOWS
 	if (path_.startsWith(separator)) {
 		if (path_.length() == 1)
 			return separator;
 		else
 			return path_.mid(1);
 	} else
-#endif
+#  endif
 		return path_;
 }
 
 
 PIString PIDir::absolutePath() const {
 	if (isAbsolute()) {
-#ifdef WINDOWS
+#  ifdef WINDOWS
 		if (path_.startsWith(separator)) {
 			if (path_.length() == 1)
 				return separator;
 			else
 				return path_.mid(1);
 		} else
-#endif
+#  endif
 			return path_;
 	}
 	return PIDir(PIDir::current().path() + separator + path_).path();
@@ -205,11 +205,11 @@ PIString PIDir::absolute(const PIString & path) const {
 
 PIDir & PIDir::setDir(const PIString & path) {
 	path_ = path;
-#ifdef WINDOWS
+#  ifdef WINDOWS
 	path_.replaceAll("\\", separator);
 	if (path_.length() > 2)
 		if (path_.mid(1, 2).contains(":")) path_.prepend(separator);
-#endif
+#  endif
 	cleanPath();
 	return *this;
 }
@@ -226,9 +226,9 @@ PIDir & PIDir::cd(const PIString & path) {
 bool PIDir::make(bool withParents) {
 	PIDir d = cleanedPath();
 	// PIString tp;
-#ifndef WINDOWS
+#  ifndef WINDOWS
 	bool is_abs = isAbsolute();
-#endif
+#  endif
 	if (withParents) {
 		PIStringList l = d.path().split(separator);
 		// piCout << l;
@@ -237,9 +237,9 @@ bool PIDir::make(bool withParents) {
 		PIString cdp;
 		for (const auto & i: l) {
 			if (!cdp.isEmpty()
-#ifndef WINDOWS
+#  ifndef WINDOWS
 			    || is_abs
-#endif
+#  endif
 			)
 				cdp += separator;
 			cdp += i;
@@ -278,11 +278,11 @@ bool PIDir::rename(const PIString & new_name) {
 }
 
 
-#ifdef WINDOWS
+#  ifdef WINDOWS
 bool sort_compare(const PIFile::FileInfo & v0, const PIFile::FileInfo & v1) {
 	return strcoll(v0.path.data(), v1.path.data()) < 0;
 }
-#endif
+#  endif
 
 
 //! \~\details
@@ -309,7 +309,7 @@ PIVector<PIFile::FileInfo> PIDir::entries(const PIRegularExpression & regexp) {
 	else if (!dp.endsWith(separator))
 		dp += separator;
 //	piCout << "start entries from" << p;
-#ifdef WINDOWS
+#  ifdef WINDOWS
 	PIFile::FileInfo fi;
 	if (dp == separator) {
 		char letters[1024];
@@ -359,8 +359,8 @@ PIVector<PIFile::FileInfo> PIDir::entries(const PIRegularExpression & regexp) {
 		}
 	}
 
-#else
-#  if defined(QNX) || defined(FREERTOS)
+#  else
+#	if defined(QNX) || defined(FREERTOS)
 	struct dirent * de = 0;
 	DIR * dir          = 0;
 	dir                = opendir(p.data());
@@ -372,24 +372,24 @@ PIVector<PIFile::FileInfo> PIDir::entries(const PIRegularExpression & regexp) {
 		}
 		closedir(dir);
 	}
-#  else
+#	else
 	dirent ** list = nullptr;
 	int cnt        = scandir(p.data(),
                       &list,
                       0,
-#	if defined(MAC_OS) || defined(ANDROID) || defined(BLACKBERRY)
+#	  if defined(MAC_OS) || defined(ANDROID) || defined(BLACKBERRY)
                       alphasort);
-#	else
+#	  else
 	                  versionsort);
-#	endif
+#	  endif
 	if (cnt < 0) return ret;
 	for (int i = 0; i < cnt; ++i) {
 		ret << PIFile::fileInfo(dp + PIString(list[i]->d_name));
 		free(list[i]);
 	}
 	free(list);
+#	endif
 #  endif
-#endif
 	//	piCout << "end entries from" << p;
 	return ret;
 }
@@ -442,45 +442,45 @@ PIVector<PIFile::FileInfo> PIDir::allEntries(const PIRegularExpression & regexp)
 
 
 bool PIDir::isExists(const PIString & path) {
-#ifdef WINDOWS
+#  ifdef WINDOWS
 	DWORD ret = GetFileAttributes((LPCTSTR)(path.data()));
 	return (ret != 0xFFFFFFFF) && (ret & FILE_ATTRIBUTE_DIRECTORY);
-#else
+#  else
 	DIR * dir_ = opendir(path.data());
 	if (dir_ == 0) return false;
 	closedir(dir_);
-#endif
+#  endif
 	return true;
 }
 
 
 PIDir PIDir::current() {
-#ifndef ESP_PLATFORM
+#  ifndef ESP_PLATFORM
 	char rc[1024];
-#endif
-#ifdef WINDOWS
+#  endif
+#  ifdef WINDOWS
 	piZeroMemory(rc, 1024);
 	if (GetCurrentDirectory(1024, (LPTSTR)rc) == 0) return PIString();
 	PIString ret(rc);
 	ret.replaceAll("\\", PIDir::separator);
 	ret.prepend(separator);
 	return PIDir(ret);
-#else
-#  ifndef ESP_PLATFORM
+#  else
+#	ifndef ESP_PLATFORM
 	if (getcwd(rc, 1024) == 0) return PIString();
 	return PIDir(rc);
-#  else
+#	else
 	return PIDir("/spiffs");
+#	endif
 #  endif
-#endif
 }
 
 
 PIDir PIDir::home() {
-#ifndef ESP_PLATFORM
+#  ifndef ESP_PLATFORM
 	char * rc = nullptr;
-#endif
-#ifdef WINDOWS
+#  endif
+#  ifdef WINDOWS
 	rc = new char[1024];
 	piZeroMemory(rc, 1024);
 	if (ExpandEnvironmentStrings((LPCTSTR) "%HOMEPATH%", (LPTSTR)rc, 1024) == 0) {
@@ -498,21 +498,21 @@ PIDir PIDir::home() {
 	delete[] rc;
 	// s.prepend(separator);
 	return PIDir(hd + hp);
-#else
-#  ifndef ESP_PLATFORM
+#  else
+#	ifndef ESP_PLATFORM
 	rc = getenv("HOME");
 	if (!rc) return PIDir();
 	return PIDir(rc);
-#  else
+#	else
 	return PIDir();
+#	endif
 #  endif
-#endif
 }
 
 
 PIDir PIDir::temporary() {
 	char * rc = nullptr;
-#ifdef WINDOWS
+#  ifdef WINDOWS
 	rc = new char[1024];
 	piZeroMemory(rc, 1024);
 	int ret = GetTempPath(1024, (LPTSTR)rc);
@@ -525,13 +525,13 @@ PIDir PIDir::temporary() {
 	delete[] rc;
 	s.prepend(separator);
 	return PIDir(s);
-#else
+#  else
 	char template_rc[] = "/tmp/pidir_tmp_XXXXXX";
 	rc                 = mkdtemp(template_rc);
 	if (!rc) return PIDir();
 	PIString s(rc);
 	return PIDir(s.left(s.findLast(PIDir::separator)));
-#endif
+#  endif
 }
 
 
@@ -548,33 +548,33 @@ bool PIDir::make(const PIString & path, bool withParents) {
 
 
 bool PIDir::setCurrent(const PIString & path) {
-#ifdef WINDOWS
+#  ifdef WINDOWS
 	if (SetCurrentDirectory((LPCTSTR)(path.data())) != 0) return true;
-#else
+#  else
 	if (chdir(path.data()) == 0) return true;
-#endif
+#  endif
 	printf("[PIDir] setCurrent(\"%s\") error: %s\n", path.data(), errorString().data());
 	return false;
 }
 
 
 bool PIDir::makeDir(const PIString & path) {
-#ifdef WINDOWS
+#  ifdef WINDOWS
 	if (CreateDirectory((LPCTSTR)(path.data()), NULL) != 0) return true;
-#else
+#  else
 	if (mkdir(path.data(), 16877) == 0) return true;
-#endif
+#  endif
 	printf("[PIDir] makeDir(\"%s\") error: %s\n", path.data(), errorString().data());
 	return false;
 }
 
 
 bool PIDir::removeDir(const PIString & path) {
-#ifdef WINDOWS
+#  ifdef WINDOWS
 	if (RemoveDirectory((LPCTSTR)(path.data())) != 0) return true;
-#else
+#  else
 	if (rmdir(path.data()) == 0) return true;
-#endif
+#  endif
 	printf("[PIDir] removeDir(\"%s\") error: %s\n", path.data(), errorString().data());
 	return false;
 }
diff --git a/libs/main/io_devices/pifile.h b/libs/main/io_devices/pifile.h
index 61048068..ce1a890f 100644
--- a/libs/main/io_devices/pifile.h
+++ b/libs/main/io_devices/pifile.h
@@ -339,8 +339,8 @@ public:
 
 //! \ioparams
 //! \{
-#ifdef DOXYGEN
-#endif
+#  ifdef DOXYGEN
+#  endif
 	//! \}
 
 protected:
diff --git a/libs/main/io_devices/pispi.cpp b/libs/main/io_devices/pispi.cpp
index 47f7f76b..3f69df3b 100644
--- a/libs/main/io_devices/pispi.cpp
+++ b/libs/main/io_devices/pispi.cpp
@@ -126,8 +126,7 @@ bool PISPI::openDevice() {
 		PRIVATE->fd = -1;
 		return false;
 	}
-	piCoutObj << "SPI open" << path() << "speed:" << spi_speed / 1000 << "KHz"
-			  << "mode" << spi_mode << "bits" << spi_bits;
+	piCoutObj << "SPI open" << path() << "speed:" << spi_speed / 1000 << "KHz" << "mode" << spi_mode << "bits" << spi_bits;
 	PRIVATE->spi_ioc_tr.delay_usecs   = 0;
 	PRIVATE->spi_ioc_tr.speed_hz      = 0;
 	PRIVATE->spi_ioc_tr.bits_per_word = spi_bits;
diff --git a/libs/main/io_devices/pispi.h b/libs/main/io_devices/pispi.h
index 74afbbf5..73454845 100644
--- a/libs/main/io_devices/pispi.h
+++ b/libs/main/io_devices/pispi.h
@@ -50,7 +50,7 @@ public:
 	//! \~english SPI mode flags.
 	//! \~russian Флаги режима SPI.
 	enum Parameters {
-		ClockInverse    = 0x1 /*! \~english Invert clock polarity \~russian Инвертировать полярность тактового сигнала */,
+		ClockInverse = 0x1 /*! \~english Invert clock polarity \~russian Инвертировать полярность тактового сигнала */,
 		ClockPhaseShift = 0x2 /*! \~english Shift sampling phase \~russian Сдвинуть фазу выборки */,
 	};
 
diff --git a/libs/main/io_utils/piethutilbase.h b/libs/main/io_utils/piethutilbase.h
index 983a24b2..25029c88 100644
--- a/libs/main/io_utils/piethutilbase.h
+++ b/libs/main/io_utils/piethutilbase.h
@@ -26,8 +26,8 @@
 #define PIETHUTILBASE_H
 #ifdef PIP_HAS_SOCKET
 
-#include "pibytearray.h"
-#include "pip_io_utils_export.h"
+#  include "pibytearray.h"
+#  include "pip_io_utils_export.h"
 
 //! \~\ingroup IO-Utils
 //! \~\brief
diff --git a/libs/main/io_utils/pipackedtcp.h b/libs/main/io_utils/pipackedtcp.h
index 94b8c3de..b23535fb 100644
--- a/libs/main/io_utils/pipackedtcp.h
+++ b/libs/main/io_utils/pipackedtcp.h
@@ -26,10 +26,10 @@
 #define pipackedtcp_H
 #ifdef PIP_HAS_SOCKET
 
-#include "piiodevice.h"
-#include "pinetworkaddress.h"
-#include "pip_io_utils_export.h"
-#include "pistreampacker.h"
+#  include "piiodevice.h"
+#  include "pinetworkaddress.h"
+#  include "pip_io_utils_export.h"
+#  include "pistreampacker.h"
 
 class PIEthernet;
 
diff --git a/libs/main/io_utils/pipacketextractor.h b/libs/main/io_utils/pipacketextractor.h
index 7b41e0da..66ff8a77 100644
--- a/libs/main/io_utils/pipacketextractor.h
+++ b/libs/main/io_utils/pipacketextractor.h
@@ -65,17 +65,17 @@ public:
 	enum SplitMode {
 		None /** \~english Accept every read chunk as a packet \~russian Считать каждый прочитанный блок отдельным пакетом */,
 		Header /** \~english Search for \a header() and use configured payload size or callback result \~russian Искать \a header() и
-				  использовать настроенный размер полезной нагрузки или результат callback */
+		          использовать настроенный размер полезной нагрузки или результат callback */
 			,
 		Footer /** \~english Use fixed payload size and validate trailing \a footer() \~russian Использовать фиксированный размер полезной
-				  нагрузки и проверять завершающий \a footer() */
+		          нагрузки и проверять завершающий \a footer() */
 			,
 		HeaderAndFooter /** \~english Search for packets bounded by \a header() and \a footer() \~russian Искать пакеты, ограниченные \a
-						   header() и \a footer() */
+		                   header() и \a footer() */
 			,
 		Size /** \~english Treat \a payloadSize() as full packet size \~russian Использовать \a payloadSize() как полный размер пакета */,
 		Timeout /** \~english Collect bytes until \a timeout() expires after the first read \~russian Накопить байты до истечения \a
-				   timeout() после первого чтения */
+		           timeout() после первого чтения */
 	};
 
 
diff --git a/libs/main/io_utils/pistreampacker.h b/libs/main/io_utils/pistreampacker.h
index ba0e52ab..955b755a 100644
--- a/libs/main/io_utils/pistreampacker.h
+++ b/libs/main/io_utils/pistreampacker.h
@@ -26,9 +26,9 @@
 #define PISTREAMPACKER_H
 #ifdef PIP_HAS_SOCKET
 
-#include "piethutilbase.h"
-#include "piobject.h"
-#include "pip_io_utils_export.h"
+#  include "piethutilbase.h"
+#  include "piobject.h"
+#  include "pip_io_utils_export.h"
 
 
 class PIIODevice;
diff --git a/libs/main/literals/piliterals_bytes.h b/libs/main/literals/piliterals_bytes.h
index 3592164d..a6ca872e 100644
--- a/libs/main/literals/piliterals_bytes.h
+++ b/libs/main/literals/piliterals_bytes.h
@@ -16,7 +16,7 @@
  */
 /*
     PIP - Platform Independent Primitives
-	Bytes C++11 literals for bytes
+    Bytes C++11 literals for bytes
     Ivan Pelipenko peri4ko@yandex.ru
 
     This program is free software: you can redistribute it and/or modify
diff --git a/libs/main/literals/piliterals_time.h b/libs/main/literals/piliterals_time.h
index fc04acef..ffc04d1e 100644
--- a/libs/main/literals/piliterals_time.h
+++ b/libs/main/literals/piliterals_time.h
@@ -6,7 +6,7 @@
  */
 /*
     PIP - Platform Independent Primitives
-	PISystemTime C++11 literals
+    PISystemTime C++11 literals
     Ivan Pelipenko peri4ko@yandex.ru
 
     This program is free software: you can redistribute it and/or modify
diff --git a/libs/main/math/pifft.h b/libs/main/math/pifft.h
index 1709753b..58148f21 100644
--- a/libs/main/math/pifft.h
+++ b/libs/main/math/pifft.h
@@ -225,17 +225,17 @@ typedef PIFFT_float PIFFTf;
 
 #  ifndef CC_VC
 
-#	define _PIFFTW_H(type)                                                           \
-	  class PIP_FFTW_EXPORT _PIFFTW_P_##type##_ {                                     \
-	public:                                                                           \
-		_PIFFTW_P_##type##_();                                                        \
-		~_PIFFTW_P_##type##_();                                                       \
-		const PIVector<complex<type>> & calcFFT(const PIVector<complex<type>> & in);  \
-		const PIVector<complex<type>> & calcFFTR(const PIVector<type> & in);          \
-		const PIVector<complex<type>> & calcFFTI(const PIVector<complex<type>> & in); \
-		void preparePlan(int size, int op);                                           \
-		void * impl;                                                                  \
-	  };
+#	define _PIFFTW_H(type)                                                               \
+		class PIP_FFTW_EXPORT _PIFFTW_P_##type##_ {                                       \
+		public:                                                                           \
+			_PIFFTW_P_##type##_();                                                        \
+			~_PIFFTW_P_##type##_();                                                       \
+			const PIVector<complex<type>> & calcFFT(const PIVector<complex<type>> & in);  \
+			const PIVector<complex<type>> & calcFFTR(const PIVector<type> & in);          \
+			const PIVector<complex<type>> & calcFFTI(const PIVector<complex<type>> & in); \
+			void preparePlan(int size, int op);                                           \
+			void * impl;                                                                  \
+		};
 _PIFFTW_H(float)
 _PIFFTW_H(double)
 _PIFFTW_H(ldouble)
diff --git a/libs/main/math/pimathmatrix.h b/libs/main/math/pimathmatrix.h
index f5f056c7..7db1e747 100644
--- a/libs/main/math/pimathmatrix.h
+++ b/libs/main/math/pimathmatrix.h
@@ -32,9 +32,9 @@
 
 /// Matrix templated
 
-#define PIMM_FOR                  \
-  for (uint r = 0; r < Rows; ++r) \
-	for (uint c = 0; c < Cols; ++c)
+#define PIMM_FOR                    \
+	for (uint r = 0; r < Rows; ++r) \
+		for (uint c = 0; c < Cols; ++c)
 #define PIMM_FOR_C for (uint i = 0; i < Cols; ++i)
 #define PIMM_FOR_R for (uint i = 0; i < Rows; ++i)
 
@@ -912,9 +912,9 @@ class PIMathMatrix;
 
 /// Matrix
 
-#define PIMM_FOR                         \
-  for (uint r = 0; r < _V2D::rows_; ++r) \
-	for (uint c = 0; c < _V2D::cols_; ++c)
+#define PIMM_FOR                           \
+	for (uint r = 0; r < _V2D::rows_; ++r) \
+		for (uint c = 0; c < _V2D::cols_; ++c)
 #define PIMM_FOR_A for (uint i = 0; i < _V2D::mat.size(); ++i)
 #define PIMM_FOR_C for (uint i = 0; i < _V2D::cols_; ++i)
 #define PIMM_FOR_R for (uint i = 0; i < _V2D::rows_; ++i)
diff --git a/libs/main/math/pimathsolver.h b/libs/main/math/pimathsolver.h
index 1fed177c..076a4f82 100644
--- a/libs/main/math/pimathsolver.h
+++ b/libs/main/math/pimathsolver.h
@@ -57,10 +57,10 @@ public:
 	//! \~english Integration method selector.
 	//! \~russian Выбор метода интегрирования.
 	enum Method {
-		Global       = -1 /** \~english Use the global default method \~russian Использовать глобальный метод по умолчанию */,
-		Eyler_1      = 01 /** \~english First-order Euler method \~russian Метод Эйлера первого порядка */,
-		Eyler_2      = 02 /** \~english Second-order Euler method \~russian Метод Эйлера второго порядка */,
-		EylerKoshi   = 03 /** \~english Euler-Cauchy method identifier \~russian Идентификатор метода Эйлера-Коши */,
+		Global = -1 /** \~english Use the global default method \~russian Использовать глобальный метод по умолчанию */,
+		Eyler_1 = 01 /** \~english First-order Euler method \~russian Метод Эйлера первого порядка */,
+		Eyler_2 = 02 /** \~english Second-order Euler method \~russian Метод Эйлера второго порядка */,
+		EylerKoshi = 03 /** \~english Euler-Cauchy method identifier \~russian Идентификатор метода Эйлера-Коши */,
 		RungeKutta_4 = 14 /** \~english Fourth-order Runge-Kutta method \~russian Метод Рунге-Кутты четвертого порядка */,
 		AdamsBashfortMoulton_2 =
 			22 /** \~english Second-order Adams-Bashforth-Moulton method \~russian Метод Адамса-Башфорта-Моултона второго порядка */,
diff --git a/libs/main/math/pistatistic.h b/libs/main/math/pistatistic.h
index b0f6143a..118bd0b8 100644
--- a/libs/main/math/pistatistic.h
+++ b/libs/main/math/pistatistic.h
@@ -5,7 +5,7 @@
 //! \~russian Вычисление математической статистики у массива чисел
 /*
     PIP - Platform Independent Primitives
-	Calculating math statistic of values array
+    Calculating math statistic of values array
     Andrey Bychkov work.a.b@yandex.ru
 
     This program is free software: you can redistribute it and/or modify
diff --git a/libs/main/mqtt_client/pimqttclient.h b/libs/main/mqtt_client/pimqttclient.h
index 6d32bf27..01fb6097 100644
--- a/libs/main/mqtt_client/pimqttclient.h
+++ b/libs/main/mqtt_client/pimqttclient.h
@@ -4,22 +4,22 @@
 //! \~english
 //! \~russian
 /*
-	PIP - Platform Independent Primitives
-	MQTT Client
-	Ivan Pelipenko peri4ko@yandex.ru
+    PIP - Platform Independent Primitives
+    MQTT Client
+    Ivan Pelipenko peri4ko@yandex.ru
 
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
 
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef pimqttclient_h
diff --git a/libs/main/opencl/piopencl.h b/libs/main/opencl/piopencl.h
index bd8b05f5..c2b7c630 100644
--- a/libs/main/opencl/piopencl.h
+++ b/libs/main/opencl/piopencl.h
@@ -5,7 +5,7 @@
 //! \~russian Классы-обертки для OpenCL
 /*
     PIP - Platform Independent Primitives
-	OpenCL wrapper classes
+    OpenCL wrapper classes
     Ivan Pelipenko peri4ko@yandex.ru
 
     This program is free software: you can redistribute it and/or modify
diff --git a/libs/main/serialization/pibinarystream.h b/libs/main/serialization/pibinarystream.h
index 0d4d1ab9..0620f8b8 100644
--- a/libs/main/serialization/pibinarystream.h
+++ b/libs/main/serialization/pibinarystream.h
@@ -56,17 +56,17 @@
 
 #else
 
-#  define BINARY_STREAM_FRIEND(T)                                              \
-	template<typename P>                                                       \
-	friend PIBinaryStream<P> & operator<<(PIBinaryStream<P> & s, const T & v); \
-	template<typename P>                                                       \
-	friend PIBinaryStream<P> & operator>>(PIBinaryStream<P> & s, T & v);
+#  define BINARY_STREAM_FRIEND(T)                                                \
+	  template<typename P>                                                       \
+	  friend PIBinaryStream<P> & operator<<(PIBinaryStream<P> & s, const T & v); \
+	  template<typename P>                                                       \
+	  friend PIBinaryStream<P> & operator>>(PIBinaryStream<P> & s, T & v);
 #  define BINARY_STREAM_WRITE(T) \
-	template<typename P>         \
-	inline PIBinaryStream<P> & operator<<(PIBinaryStream<P> & s, const T & v)
+	  template<typename P>       \
+	  inline PIBinaryStream<P> & operator<<(PIBinaryStream<P> & s, const T & v)
 #  define BINARY_STREAM_READ(T) \
-	template<typename P>        \
-	inline PIBinaryStream<P> & operator>>(PIBinaryStream<P> & s, T & v)
+	  template<typename P>      \
+	  inline PIBinaryStream<P> & operator>>(PIBinaryStream<P> & s, T & v)
 
 #endif
 
diff --git a/libs/main/serialization/pijsonserialization.h b/libs/main/serialization/pijsonserialization.h
index 9401feaf..686138d5 100644
--- a/libs/main/serialization/pijsonserialization.h
+++ b/libs/main/serialization/pijsonserialization.h
@@ -10,7 +10,7 @@
 //! Этот файл предоставляет шаблонные функции для сериализации и десериализации различных типов в формат PIJSON и из него.
 /*
     PIP - Platform Independent Primitives
-	Generic JSON serialization helpers
+    Generic JSON serialization helpers
     Ivan Pelipenko peri4ko@yandex.ru
 
     This program is free software: you can redistribute it and/or modify
@@ -63,7 +63,7 @@ template<typename T,
          typename std::enable_if<!std::is_arithmetic<T>::value, int>::type = 0>
 inline PIJSON piSerializeJSON(const T & v) {
 	static_assert(std::is_enum<T>::value || std::is_arithmetic<T>::value,
-				  "[piSerializeJSON] Error: using undeclared piSerializeJSON() for complex type!");
+	              "[piSerializeJSON] Error: using undeclared piSerializeJSON() for complex type!");
 	return {};
 }
 
@@ -329,7 +329,7 @@ template<typename T,
          typename std::enable_if<!std::is_arithmetic<T>::value, int>::type = 0>
 inline void piDeserializeJSON(T & v, const PIJSON & js) {
 	static_assert(std::is_enum<T>::value || std::is_arithmetic<T>::value,
-				  "[piDeserializeJSON] Error: using undeclared piDeserializeJSON() for complex type!");
+	              "[piDeserializeJSON] Error: using undeclared piDeserializeJSON() for complex type!");
 	v = {};
 }
 
diff --git a/libs/main/serialization/pivaluetree_conversions.h b/libs/main/serialization/pivaluetree_conversions.h
index 15d505be..1f076152 100644
--- a/libs/main/serialization/pivaluetree_conversions.h
+++ b/libs/main/serialization/pivaluetree_conversions.h
@@ -39,14 +39,14 @@ namespace PIValueTreeConversions {
 //! \~english Conversion options.
 //! \~russian Параметры преобразования.
 enum Option {
-    WithAttributes = 0x1 /** \~english Include node attributes \~russian Включать атрибуты узлов */,
-    WithComment    = 0x2 /** \~english Include node comments \~russian Включать комментарии узлов */,
-    WithType       = 0x4 /** \~english Include textual value type information \~russian Включать текстовую информацию о типе значения */,
-    WithAll        = 0xFFF /** \~english Enable all content flags \~russian Включать все флаги содержимого */,
-    IncludeRoot    = 0x1000 /** \~english Serialize the passed root node itself instead of only its children \~russian Сериализовать сам
-                               переданный корневой узел, а не только его дочерние элементы */
-        ,
-    Default = WithAll /** \~english Default conversion options \~russian Параметры преобразования по умолчанию */
+	WithAttributes = 0x1 /** \~english Include node attributes \~russian Включать атрибуты узлов */,
+	WithComment    = 0x2 /** \~english Include node comments \~russian Включать комментарии узлов */,
+	WithType = 0x4 /** \~english Include textual value type information \~russian Включать текстовую информацию о типе значения */,
+	WithAll = 0xFFF /** \~english Enable all content flags \~russian Включать все флаги содержимого */,
+	IncludeRoot = 0x1000 /** \~english Serialize the passed root node itself instead of only its children \~russian Сериализовать сам
+	                        переданный корневой узел, а не только его дочерние элементы */
+		,
+	Default = WithAll /** \~english Default conversion options \~russian Параметры преобразования по умолчанию */
 };
 
 //! \~english Bit mask of %PIValueTree conversion options.
diff --git a/libs/main/state_machine/pistatemachine.cpp b/libs/main/state_machine/pistatemachine.cpp
index 21a9bf55..3d23b5a7 100644
--- a/libs/main/state_machine/pistatemachine.cpp
+++ b/libs/main/state_machine/pistatemachine.cpp
@@ -1,6 +1,6 @@
 /*
     PIP - Platform Independent Primitives
-	State machine
+    State machine
     Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
 
     This program is free software: you can redistribute it and/or modify
diff --git a/libs/main/state_machine/pistatemachine.h b/libs/main/state_machine/pistatemachine.h
index a2db754e..2ab3f893 100644
--- a/libs/main/state_machine/pistatemachine.h
+++ b/libs/main/state_machine/pistatemachine.h
@@ -12,8 +12,8 @@
 //! PIStateBase, PITransitionBase
 /*
     PIP - Platform Independent Primitives
-	State machine
-	Ivan Pelipenko peri4ko@yandex.ru
+    State machine
+    Ivan Pelipenko peri4ko@yandex.ru
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Lesser General Public License as published by
diff --git a/libs/main/state_machine/pistatemachine_state.cpp b/libs/main/state_machine/pistatemachine_state.cpp
index 6a5162d8..b896218a 100644
--- a/libs/main/state_machine/pistatemachine_state.cpp
+++ b/libs/main/state_machine/pistatemachine_state.cpp
@@ -1,20 +1,20 @@
 /*
-	PIP - Platform Independent Primitives
-	State machine
-	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
+    PIP - Platform Independent Primitives
+    State machine
+    Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
 
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
 
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pistatemachine_state.h"
diff --git a/libs/main/state_machine/pistatemachinemodule.h b/libs/main/state_machine/pistatemachinemodule.h
index 0049df2c..7d7b28c4 100644
--- a/libs/main/state_machine/pistatemachinemodule.h
+++ b/libs/main/state_machine/pistatemachinemodule.h
@@ -4,22 +4,22 @@
 //! \~english Declares module entry includes for the state machine API
 //! \~russian Объявляет основной include модуля API машины состояний
 /*
-	PIP - Platform Independent Primitives
-	Module includes
-	Ivan Pelipenko peri4ko@yandex.ru
+    PIP - Platform Independent Primitives
+    Module includes
+    Ivan Pelipenko peri4ko@yandex.ru
 
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
 
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 //! \defgroup StateMachine StateMachine
 //! \~\brief
diff --git a/libs/main/system/pilibrary.cpp b/libs/main/system/pilibrary.cpp
index d5b225da..a8f82649 100644
--- a/libs/main/system/pilibrary.cpp
+++ b/libs/main/system/pilibrary.cpp
@@ -201,7 +201,7 @@ void * PILibrary::resolve(const char * symbol) {
 #  ifdef WINDOWS
 	ret = (void *)GetProcAddress(PRIVATE->hLib, symbol);
 #  else
-	ret            = dlsym(PRIVATE->hLib, symbol);
+	ret = dlsym(PRIVATE->hLib, symbol);
 #  endif
 	getLastError();
 	return ret;
@@ -214,7 +214,7 @@ bool PILibrary::loadInternal() {
 #  ifdef WINDOWS
 	PRIVATE->hLib = LoadLibraryA(libpath.data());
 #  else
-	PRIVATE->hLib  = dlopen(libpath.data(), RTLD_LAZY);
+	PRIVATE->hLib = dlopen(libpath.data(), RTLD_LAZY);
 #  endif
 	getLastError();
 	return PRIVATE->hLib;
diff --git a/libs/main/system/piplugin.h b/libs/main/system/piplugin.h
index eac36920..fb220c96 100644
--- a/libs/main/system/piplugin.h
+++ b/libs/main/system/piplugin.h
@@ -96,28 +96,30 @@
 #	define __PIP_PLUGIN_STATIC_MERGE_FUNC__   pip_merge_static
 #	define __PIP_PLUGIN_LOADER_VERSION__      2
 
-#	define PIP_PLUGIN_SET_USER_VERSION(v)                                  \
-	  STATIC_INITIALIZER_BEGIN                                              \
-		PIPluginInfo * pi = PIPluginInfoStorage::instance()->currentInfo(); \
-		if (pi) pi->setUserVersion(v);                                      \
-	  STATIC_INITIALIZER_END
+#	define PIP_PLUGIN_SET_USER_VERSION(v)                                      \
+		STATIC_INITIALIZER_BEGIN                                                \
+			PIPluginInfo * pi = PIPluginInfoStorage::instance()->currentInfo(); \
+			if (pi) pi->setUserVersion(v);                                      \
+		STATIC_INITIALIZER_END
 
-#	define PIP_PLUGIN_ADD_STATIC_SECTION(type, ptr)                        \
-	  STATIC_INITIALIZER_BEGIN                                              \
-		PIPluginInfo * pi = PIPluginInfoStorage::instance()->currentInfo(); \
-		if (pi) pi->setStaticSection(type, ptr);                            \
-	  STATIC_INITIALIZER_END
+#	define PIP_PLUGIN_ADD_STATIC_SECTION(type, ptr)                            \
+		STATIC_INITIALIZER_BEGIN                                                \
+			PIPluginInfo * pi = PIPluginInfoStorage::instance()->currentInfo(); \
+			if (pi) pi->setStaticSection(type, ptr);                            \
+		STATIC_INITIALIZER_END
 
-#	define PIP_PLUGIN                                                                                     \
-	  extern "C" {                                                                                         \
-	  PIP_PLUGIN_EXPORT int __PIP_PLUGIN_LOADER_VERSION_FUNC__() { return __PIP_PLUGIN_LOADER_VERSION__; } \
-	  }
+#	define PIP_PLUGIN                                               \
+		extern "C" {                                                 \
+		PIP_PLUGIN_EXPORT int __PIP_PLUGIN_LOADER_VERSION_FUNC__() { \
+			return __PIP_PLUGIN_LOADER_VERSION__;                    \
+		}                                                            \
+		}
 
-#	define PIP_PLUGIN_STATIC_SECTION_MERGE                                                      \
-	  extern "C" {                                                                               \
-	  PIP_PLUGIN_EXPORT void __PIP_PLUGIN_STATIC_MERGE_FUNC__(int type, void * from, void * to); \
-	  }                                                                                          \
-	  void __PIP_PLUGIN_STATIC_MERGE_FUNC__(int type, void * from, void * to)
+#	define PIP_PLUGIN_STATIC_SECTION_MERGE                                                        \
+		extern "C" {                                                                               \
+		PIP_PLUGIN_EXPORT void __PIP_PLUGIN_STATIC_MERGE_FUNC__(int type, void * from, void * to); \
+		}                                                                                          \
+		void __PIP_PLUGIN_STATIC_MERGE_FUNC__(int type, void * from, void * to)
 
 
 #  endif
diff --git a/libs/main/system/pisignals.h b/libs/main/system/pisignals.h
index 55e920fb..b74a056a 100644
--- a/libs/main/system/pisignals.h
+++ b/libs/main/system/pisignals.h
@@ -38,23 +38,23 @@ public:
 	//! \~english Supported process signals.
 	//! \~russian Поддерживаемые сигналы процесса.
 	enum Signal {
-		Interrupt    = 0x01 /** \~english Interrupt from keyboard \~russian Прерывание с клавиатуры */,
-		Illegal      = 0x02 /** \~english Illegal instruction \~russian Недопустимая инструкция */,
-		Abort        = 0x04 /** \~english Abort signal \~russian Сигнал аварийного завершения */,
-		FPE          = 0x08 /** \~english Floating-point exception \~russian Исключение с плавающей точкой */,
-		SegFault     = 0x10 /** \~english Invalid memory reference \~russian Недопустимое обращение к памяти */,
-		Termination  = 0x20 /** \~english Termination request \~russian Запрос на завершение */,
-		Hangup       = 0x40 /** \~english Hangup on controlling terminal \~russian Разрыв управляющего терминала */,
-		Quit         = 0x80 /** \~english Quit from keyboard \~russian Завершение с клавиатуры */,
-		Kill         = 0x100 /** \~english Forced termination \~russian Принудительное завершение */,
-		BrokenPipe   = 0x200 /** \~english Write to a pipe without readers \~russian Запись в канал без читателей */,
-		Timer        = 0x400 /** \~english Alarm timer signal \~russian Сигнал таймера alarm */,
+		Interrupt   = 0x01 /** \~english Interrupt from keyboard \~russian Прерывание с клавиатуры */,
+		Illegal     = 0x02 /** \~english Illegal instruction \~russian Недопустимая инструкция */,
+		Abort       = 0x04 /** \~english Abort signal \~russian Сигнал аварийного завершения */,
+		FPE         = 0x08 /** \~english Floating-point exception \~russian Исключение с плавающей точкой */,
+		SegFault    = 0x10 /** \~english Invalid memory reference \~russian Недопустимое обращение к памяти */,
+		Termination = 0x20 /** \~english Termination request \~russian Запрос на завершение */,
+		Hangup = 0x40 /** \~english Hangup on controlling terminal \~russian Разрыв управляющего терминала */,
+		Quit   = 0x80 /** \~english Quit from keyboard \~russian Завершение с клавиатуры */,
+		Kill   = 0x100 /** \~english Forced termination \~russian Принудительное завершение */,
+		BrokenPipe = 0x200 /** \~english Write to a pipe without readers \~russian Запись в канал без читателей */,
+		Timer      = 0x400 /** \~english Alarm timer signal \~russian Сигнал таймера alarm */,
 		UserDefined1 = 0x800 /** \~english User-defined signal 1 \~russian Пользовательский сигнал 1 */,
 		UserDefined2 = 0x1000 /** \~english User-defined signal 2 \~russian Пользовательский сигнал 2 */,
 		ChildStopped = 0x2000 /** \~english Child process changed state \~russian Дочерний процесс изменил состояние */,
-		Continue     = 0x4000 /** \~english Continue a stopped process \~russian Продолжение остановленного процесса */,
-		StopProcess  = 0x8000 /** \~english Stop process execution \~russian Остановить выполнение процесса */,
-		StopTTY      = 0x10000 /** \~english Stop from terminal \~russian Остановка с терминала */,
+		Continue = 0x4000 /** \~english Continue a stopped process \~russian Продолжение остановленного процесса */,
+		StopProcess = 0x8000 /** \~english Stop process execution \~russian Остановить выполнение процесса */,
+		StopTTY     = 0x10000 /** \~english Stop from terminal \~russian Остановка с терминала */,
 		StopTTYInput =
 			0x20000 /** \~english Background process requested terminal input \~russian Фоновый процесс запросил ввод с терминала */,
 		StopTTYOutput =
diff --git a/libs/main/text/piregularexpression.cpp b/libs/main/text/piregularexpression.cpp
index cb0470c3..d27f09c5 100644
--- a/libs/main/text/piregularexpression.cpp
+++ b/libs/main/text/piregularexpression.cpp
@@ -97,12 +97,12 @@ PRIVATE_DEFINITION_START(PIRegularExpression)
 
 	void match(Matcher & ret) {
 		const int rc  = pcre2_match(compiled,
-								   (PCRE2_SPTR)ret.subjectPtr(),
-								   ret.subject->size(),
-								   ret.start_offset,
-								   PCRE2_NO_UTF_CHECK,
-								   match_data,
-								   nullptr);
+                                   (PCRE2_SPTR)ret.subjectPtr(),
+                                   ret.subject->size(),
+                                   ret.start_offset,
+                                   PCRE2_NO_UTF_CHECK,
+                                   match_data,
+                                   nullptr);
 		ret.has_match = ret.is_error = false;
 		ret.groups.clear();
 		if (rc == PCRE2_ERROR_NOMATCH) return;
@@ -323,11 +323,11 @@ void PIRegularExpression::convertFrom(const PIString & pattern, uint type, Optio
 	PCRE2_UCHAR * out   = nullptr;
 	PCRE2_SIZE out_size = 0;
 	const int rc        = pcre2_pattern_convert((PCRE2_SPTR)cptr,
-										 pattern.size_s(),
-										 type | PCRE2_CONVERT_UTF | PCRE2_CONVERT_NO_UTF_CHECK,
-										 &out,
-										 &out_size,
-										 nullptr);
+                                         pattern.size_s(),
+                                         type | PCRE2_CONVERT_UTF | PCRE2_CONVERT_NO_UTF_CHECK,
+                                         &out,
+                                         &out_size,
+                                         nullptr);
 	if (rc != 0) {
 		piCout << "PIRegularExpression::convertFrom error" << rc;
 	} else {
diff --git a/libs/main/text/piregularexpression.h b/libs/main/text/piregularexpression.h
index 22ae5072..9c5c0760 100644
--- a/libs/main/text/piregularexpression.h
+++ b/libs/main/text/piregularexpression.h
@@ -38,7 +38,7 @@ public:
 	enum Option {
 		None            = 0x0 /*!< \~english No extra options \~russian Без дополнительных опций */,
 		CaseInsensitive = 0x01 /*!< \~english Ignore character case \~russian Игнорировать регистр символов */,
-		Singleline      = 0x02 /*!< \~english Let \c . match a newline \~russian Разрешить \c . совпадать с переводом строки */,
+		Singleline = 0x02 /*!< \~english Let \c . match a newline \~russian Разрешить \c . совпадать с переводом строки */,
 		Multiline =
 			0x04 /*!< \~english Let \c ^ and \c $ work on line boundaries \~russian Разрешить \c ^ и \c $ работать на границах строк */,
 		InvertedGreediness =
diff --git a/libs/main/thread/piblockingqueue.h b/libs/main/thread/piblockingqueue.h
index 8071248e..e7660f04 100644
--- a/libs/main/thread/piblockingqueue.h
+++ b/libs/main/thread/piblockingqueue.h
@@ -5,7 +5,7 @@
 //! \~russian Шаблон блокирующей очереди
 /*
     PIP - Platform Independent Primitives
-	Blocking queue template
+    Blocking queue template
     Stephan Fomenko
 
     This program is free software: you can redistribute it and/or modify
diff --git a/libs/main/thread/piconditionvar.cpp b/libs/main/thread/piconditionvar.cpp
index 4a1fa9fb..ae3ec21c 100644
--- a/libs/main/thread/piconditionvar.cpp
+++ b/libs/main/thread/piconditionvar.cpp
@@ -24,124 +24,124 @@
 #endif
 
 #ifdef PIP_HAS_THREADS
-#include "piconditionvar.h"
-#include "piincludes_p.h"
-#ifdef WINDOWS
-#  include <synchapi.h>
-#  include <winbase.h>
-#  include <windef.h>
-#endif
-#ifdef FREERTOS
-#  include <event_groups.h>
-#endif
+#  include "piconditionvar.h"
+#  include "piincludes_p.h"
+#  ifdef WINDOWS
+#	include <synchapi.h>
+#	include <winbase.h>
+#	include <windef.h>
+#  endif
+#  ifdef FREERTOS
+#	include <event_groups.h>
+#  endif
 
 
 PRIVATE_DEFINITION_START(PIConditionVariable)
-#if defined(WINDOWS)
+#  if defined(WINDOWS)
 	CONDITION_VARIABLE
-#elif defined(FREERTOS)
+#  elif defined(FREERTOS)
 	EventGroupHandle_t
-#else
+#  else
 	pthread_cond_t
-#endif
+#  endif
 	nativeHandle;
 PRIVATE_DEFINITION_END(PIConditionVariable)
 
 
 PIConditionVariable::PIConditionVariable() {
-#if defined(WINDOWS)
+#  if defined(WINDOWS)
 	InitializeConditionVariable(&PRIVATE->nativeHandle);
-#elif defined(FREERTOS)
+#  elif defined(FREERTOS)
 	PRIVATE->nativeHandle = xEventGroupCreate();
-#else
+#  else
 	pthread_condattr_t condattr;
 	pthread_condattr_init(&condattr);
-#  if !defined(MAC_OS)
+#	if !defined(MAC_OS)
 	pthread_condattr_setclock(&condattr, CLOCK_MONOTONIC);
-#  endif
+#	endif
 	piZeroMemory(PRIVATE->nativeHandle);
 	pthread_cond_init(&PRIVATE->nativeHandle, &condattr);
-#endif
+#  endif
 }
 
 
 PIConditionVariable::~PIConditionVariable() {
-#if defined(WINDOWS)
-#elif defined(FREERTOS)
+#  if defined(WINDOWS)
+#  elif defined(FREERTOS)
 	vEventGroupDelete(PRIVATE->nativeHandle);
-#else
+#  else
 	pthread_cond_destroy(&PRIVATE->nativeHandle);
-#endif
+#  endif
 }
 
 
 void PIConditionVariable::wait(PIMutex & lk) {
-#if defined(WINDOWS)
+#  if defined(WINDOWS)
 	SleepConditionVariableCS(&PRIVATE->nativeHandle, (PCRITICAL_SECTION)lk.handle(), INFINITE);
-#elif defined(FREERTOS)
+#  elif defined(FREERTOS)
 	xEventGroupClearBits(PRIVATE->nativeHandle, 1);
 	xEventGroupWaitBits(PRIVATE->nativeHandle, 1, pdTRUE, pdTRUE, portMAX_DELAY);
-#else
+#  else
 	pthread_cond_wait(&PRIVATE->nativeHandle, (pthread_mutex_t *)lk.handle());
-#endif
+#  endif
 }
 
 
 void PIConditionVariable::wait(PIMutex & lk, std::function<bool()> condition) {
 	while (true) {
 		if (condition()) break;
-#if defined(WINDOWS)
+#  if defined(WINDOWS)
 		SleepConditionVariableCS(&PRIVATE->nativeHandle, (PCRITICAL_SECTION)lk.handle(), INFINITE);
-#elif defined(FREERTOS)
+#  elif defined(FREERTOS)
 		xEventGroupClearBits(PRIVATE->nativeHandle, 1);
 		xEventGroupWaitBits(PRIVATE->nativeHandle, 1, pdTRUE, pdTRUE, portMAX_DELAY);
-#else
+#  else
 		pthread_cond_wait(&PRIVATE->nativeHandle, (pthread_mutex_t *)lk.handle());
-#endif
+#  endif
 	}
 }
 
 
 bool PIConditionVariable::waitFor(PIMutex & lk, PISystemTime timeout) {
 	bool isNotTimeout;
-#if defined(WINDOWS)
+#  if defined(WINDOWS)
 	isNotTimeout = SleepConditionVariableCS(&PRIVATE->nativeHandle, (PCRITICAL_SECTION)lk.handle(), timeout.toMilliseconds()) != 0;
-#elif defined(FREERTOS)
+#  elif defined(FREERTOS)
 	xEventGroupClearBits(PRIVATE->nativeHandle, 1);
 	EventBits_t uxBits;
-	uxBits          = xEventGroupWaitBits(PRIVATE->nativeHandle, 1, pdTRUE, pdTRUE, timeout.toMilliseconds() / portTICK_PERIOD_MS);
-	isNotTimeout    = (uxBits & 1) != 0;
-#else
+	uxBits       = xEventGroupWaitBits(PRIVATE->nativeHandle, 1, pdTRUE, pdTRUE, timeout.toMilliseconds() / portTICK_PERIOD_MS);
+	isNotTimeout = (uxBits & 1) != 0;
+#  else
 	PISystemTime st = PISystemTime::current(true) + timeout;
 	timespec expire_ts;
 	st.toTimespec(&expire_ts);
 	isNotTimeout = pthread_cond_timedwait(&PRIVATE->nativeHandle, (pthread_mutex_t *)lk.handle(), &expire_ts) == 0;
-#endif
+#  endif
 	return isNotTimeout;
 }
 
 
 bool PIConditionVariable::waitFor(PIMutex & lk, PISystemTime timeout, std::function<bool()> condition) {
-#if defined(WINDOWS) || defined(FREERTOS)
+#  if defined(WINDOWS) || defined(FREERTOS)
 	PITimeMeasurer measurer;
-#else
+#  else
 	PISystemTime st = PISystemTime::current(true) + timeout;
 	timespec expire_ts;
 	st.toTimespec(&expire_ts);
-#endif
-#ifdef FREERTOS
+#  endif
+#  ifdef FREERTOS
 	xEventGroupClearBits(PRIVATE->nativeHandle, 1);
-#endif
+#  endif
 	while (true) {
 		if (condition()) break;
 		bool isTimeout;
-#if defined(WINDOWS)
+#  if defined(WINDOWS)
 		{
 			int remain = (int)(timeout.toMilliseconds() - (int)measurer.elapsed_m());
 			if (remain <= 0) return false;
 			isTimeout = SleepConditionVariableCS(&PRIVATE->nativeHandle, (PCRITICAL_SECTION)lk.handle(), remain) == 0;
 		}
-#elif defined(FREERTOS)
+#  elif defined(FREERTOS)
 		{
 			int remain = (int)(timeout.toMilliseconds() - (int)measurer.elapsed_m());
 			if (remain <= 0) return false;
@@ -149,9 +149,9 @@ bool PIConditionVariable::waitFor(PIMutex & lk, PISystemTime timeout, std::funct
 			uxBits    = xEventGroupWaitBits(PRIVATE->nativeHandle, 1, pdTRUE, pdTRUE, remain / portTICK_PERIOD_MS);
 			isTimeout = (uxBits & 1) == 0;
 		}
-#else
+#  else
 		isTimeout = pthread_cond_timedwait(&PRIVATE->nativeHandle, (pthread_mutex_t *)lk.handle(), &expire_ts) != 0;
-#endif
+#  endif
 		if (isTimeout) return false;
 	}
 	return true;
@@ -159,23 +159,23 @@ bool PIConditionVariable::waitFor(PIMutex & lk, PISystemTime timeout, std::funct
 
 
 void PIConditionVariable::notifyOne() {
-#if defined(WINDOWS)
+#  if defined(WINDOWS)
 	WakeConditionVariable(&PRIVATE->nativeHandle);
-#elif defined(FREERTOS)
+#  elif defined(FREERTOS)
 	xEventGroupSetBits(PRIVATE->nativeHandle, 1);
-#else
+#  else
 	pthread_cond_signal(&PRIVATE->nativeHandle);
-#endif
+#  endif
 }
 
 
 void PIConditionVariable::notifyAll() {
-#if defined(WINDOWS)
+#  if defined(WINDOWS)
 	WakeAllConditionVariable(&PRIVATE->nativeHandle);
-#elif defined(FREERTOS)
+#  elif defined(FREERTOS)
 	xEventGroupSetBits(PRIVATE->nativeHandle, 1);
-#else
+#  else
 	pthread_cond_broadcast(&PRIVATE->nativeHandle);
-#endif
+#  endif
 }
 #endif // PIP_HAS_THREADS
diff --git a/libs/main/thread/pimutex.cpp b/libs/main/thread/pimutex.cpp
index 37774d90..56df0740 100644
--- a/libs/main/thread/pimutex.cpp
+++ b/libs/main/thread/pimutex.cpp
@@ -108,26 +108,26 @@
 
 
 #ifdef PIP_HAS_THREADS
-#include "pimutex.h"
+#  include "pimutex.h"
 
-#include "piincludes_p.h"
-#if defined(WINDOWS)
-#  include <synchapi.h>
-#elif defined(FREERTOS)
-#  include <semphr.h>
-#else
-#  include <pthread.h>
-#endif
+#  include "piincludes_p.h"
+#  if defined(WINDOWS)
+#	include <synchapi.h>
+#  elif defined(FREERTOS)
+#	include <semphr.h>
+#  else
+#	include <pthread.h>
+#  endif
 
 
 PRIVATE_DEFINITION_START(PIMutex)
-#if defined(WINDOWS)
+#  if defined(WINDOWS)
 	CRITICAL_SECTION
-#elif defined(FREERTOS)
+#  elif defined(FREERTOS)
 	SemaphoreHandle_t
-#else
+#  else
 	pthread_mutex_t
-#endif
+#  endif
 	mutex;
 PRIVATE_DEFINITION_END(PIMutex)
 
@@ -150,13 +150,13 @@ PIMutex::~PIMutex() {
 //! Если мьютекс свободен, то блокирует его и возвращает управление немедленно.
 //! Если мьютекс заблокирован, то ожидает разблокировки, затем блокирует и возвращает управление
 void PIMutex::lock() {
-#if defined(WINDOWS)
+#  if defined(WINDOWS)
 	EnterCriticalSection(&(PRIVATE->mutex));
-#elif defined(FREERTOS)
+#  elif defined(FREERTOS)
 	xSemaphoreTake(PRIVATE->mutex, portMAX_DELAY);
-#else
+#  else
 	pthread_mutex_lock(&(PRIVATE->mutex));
-#endif
+#  endif
 }
 
 
@@ -166,13 +166,13 @@ void PIMutex::lock() {
 //! \~russian
 //! В любом случае возвращает управление немедленно
 void PIMutex::unlock() {
-#if defined(WINDOWS)
+#  if defined(WINDOWS)
 	LeaveCriticalSection(&(PRIVATE->mutex));
-#elif defined(FREERTOS)
+#  elif defined(FREERTOS)
 	xSemaphoreGive(PRIVATE->mutex);
-#else
+#  else
 	pthread_mutex_unlock(&(PRIVATE->mutex));
-#endif
+#  endif
 }
 
 
@@ -183,32 +183,32 @@ void PIMutex::unlock() {
 //! \~russian
 bool PIMutex::tryLock() {
 	bool ret =
-#if defined(WINDOWS)
+#  if defined(WINDOWS)
 		(TryEnterCriticalSection(&(PRIVATE->mutex)) != 0);
-#elif defined(FREERTOS)
+#  elif defined(FREERTOS)
 		xSemaphoreTake(PRIVATE->mutex, 0);
-#else
+#  else
 		(pthread_mutex_trylock(&(PRIVATE->mutex)) == 0);
-#endif
+#  endif
 	return ret;
 }
 
 
 void * PIMutex::handle() {
-#ifdef FREERTOS
+#  ifdef FREERTOS
 	return PRIVATE->mutex;
-#else
+#  else
 	return (void *)&(PRIVATE->mutex);
-#endif
+#  endif
 }
 
 
 void PIMutex::init() {
-#if defined(WINDOWS)
+#  if defined(WINDOWS)
 	InitializeCriticalSection(&(PRIVATE->mutex));
-#elif defined(FREERTOS)
+#  elif defined(FREERTOS)
 	PRIVATE->mutex = xSemaphoreCreateMutex();
-#else
+#  else
 	pthread_mutexattr_t attr;
 	piZeroMemory(attr);
 	pthread_mutexattr_init(&attr);
@@ -216,17 +216,17 @@ void PIMutex::init() {
 	piZeroMemory(PRIVATE->mutex);
 	pthread_mutex_init(&(PRIVATE->mutex), &attr);
 	pthread_mutexattr_destroy(&attr);
-#endif
+#  endif
 }
 
 
 void PIMutex::destroy() {
-#if defined(WINDOWS)
+#  if defined(WINDOWS)
 	DeleteCriticalSection(&(PRIVATE->mutex));
-#elif defined(FREERTOS)
+#  elif defined(FREERTOS)
 	vSemaphoreDelete(PRIVATE->mutex);
-#else
+#  else
 	pthread_mutex_destroy(&(PRIVATE->mutex));
-#endif
+#  endif
 }
 #endif // PIP_HAS_THREADS
diff --git a/libs/main/thread/pisemaphore.cpp b/libs/main/thread/pisemaphore.cpp
index 4d0a90f2..0c06489d 100644
--- a/libs/main/thread/pisemaphore.cpp
+++ b/libs/main/thread/pisemaphore.cpp
@@ -1,7 +1,7 @@
 /*
     PIP - Platform Independent Primitives
-	PISemaphore, PISemaphoreLocker
-	Ivan Pelipenko peri4ko@yandex.ru
+    PISemaphore, PISemaphoreLocker
+    Ivan Pelipenko peri4ko@yandex.ru
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Lesser General Public License as published by
diff --git a/libs/main/thread/pitimer.cpp b/libs/main/thread/pitimer.cpp
index 96340e43..d9e83954 100644
--- a/libs/main/thread/pitimer.cpp
+++ b/libs/main/thread/pitimer.cpp
@@ -18,11 +18,11 @@
 */
 
 #ifdef PIP_HAS_THREADS
-#include "pitimer.h"
+#  include "pitimer.h"
 
-#include "piconditionvar.h"
-#include "piliterals_time.h"
-#include "pithread.h"
+#  include "piconditionvar.h"
+#  include "piliterals_time.h"
+#  include "pithread.h"
 
 
 //! \addtogroup Thread
diff --git a/libs/main/types/pisystemtime.cpp b/libs/main/types/pisystemtime.cpp
index bd2cc217..d174fca9 100644
--- a/libs/main/types/pisystemtime.cpp
+++ b/libs/main/types/pisystemtime.cpp
@@ -329,8 +329,7 @@ PISystemTime PITimeMeasurer::elapsedAndReset() {
 
 PISystemTime PISystemTime::Frequency::toSystemTime() const {
 	if (value_hz <= 0.) {
-		piCout << "[PISystemTime::Frequency]"
-			   << "toSystemTime() Warning: invalid hertz: %1"_tr("PISystemTime").arg(value_hz);
+		piCout << "[PISystemTime::Frequency]" << "toSystemTime() Warning: invalid hertz: %1"_tr("PISystemTime").arg(value_hz);
 		return PISystemTime();
 	}
 	return PISystemTime::fromSeconds(1. / value_hz);
@@ -339,8 +338,7 @@ PISystemTime PISystemTime::Frequency::toSystemTime() const {
 
 PISystemTime::Frequency PISystemTime::Frequency::fromSystemTime(const PISystemTime & st) {
 	if (st == PISystemTime()) {
-		piCout << "[PISystemTime::Frequency]"
-			   << "fromSystemTime() Warning: null frequency"_tr("PISystemTime");
+		piCout << "[PISystemTime::Frequency]" << "fromSystemTime() Warning: null frequency"_tr("PISystemTime");
 		return Frequency();
 	}
 	return Frequency(1. / st.toSeconds());
diff --git a/libs/main/types/pivariant.h b/libs/main/types/pivariant.h
index e5832a6f..515c1296 100644
--- a/libs/main/types/pivariant.h
+++ b/libs/main/types/pivariant.h
@@ -101,21 +101,21 @@ struct __PIVariantTypeInfo__ {
 	typedef const T & ConstReferenceType;
 };
 
-#  define __TYPEINFO_SINGLE(PT, T)           \
-	template<>                               \
-	struct __PIVariantTypeInfo__<T> {        \
-	  typedef PT PureType;                   \
-	  typedef const PT ConstPureType;        \
-	  typedef PT * PointerType;              \
-	  typedef const PT * ConstPointerType;   \
-	  typedef PT & ReferenceType;            \
-	  typedef const PT & ConstReferenceType; \
-	};
+#  define __TYPEINFO_SINGLE(PT, T)               \
+	  template<>                                 \
+	  struct __PIVariantTypeInfo__<T> {          \
+		  typedef PT PureType;                   \
+		  typedef const PT ConstPureType;        \
+		  typedef PT * PointerType;              \
+		  typedef const PT * ConstPointerType;   \
+		  typedef PT & ReferenceType;            \
+		  typedef const PT & ConstReferenceType; \
+	  };
 
 #  define REGISTER_VARIANT_TYPEINFO(T) \
-	__TYPEINFO_SINGLE(T, T &)          \
-	__TYPEINFO_SINGLE(T, const T)      \
-	__TYPEINFO_SINGLE(T, const T &)
+	  __TYPEINFO_SINGLE(T, T &)        \
+	  __TYPEINFO_SINGLE(T, const T)    \
+	  __TYPEINFO_SINGLE(T, const T &)
 
 
 class PIP_EXPORT __PIVariantInfoStorage__ {
@@ -124,67 +124,72 @@ public:
 };
 
 
-#  define REGISTER_VARIANT(classname)                                                     \
-	template<>                                                                            \
-	inline PIString __PIVariantFunctions__<classname>::typeNameHelper() {                 \
-	  static PIString tn = PIStringAscii(#classname);                                     \
-	  return tn;                                                                          \
-	}                                                                                     \
-	template<>                                                                            \
-	inline uint __PIVariantFunctions__<classname>::typeIDHelper() {                       \
-	  static uint ret = PIStringAscii(#classname).hash();                                 \
-	  return ret;                                                                         \
-	}                                                                                     \
-	REGISTER_VARIANT_TYPEINFO(classname)                                                  \
-	STATIC_INITIALIZER_BEGIN                                                              \
-	  uint type_id       = __PIVariantFunctions__<classname>::typeIDHelper();             \
-	  PIString type_name = __PIVariantFunctions__<classname>::typeNameHelper();           \
-	  if (__PIVariantInfoStorage__::get().contains(type_id)) return;                      \
-	  PIByteArray empty;                                                                  \
-	  empty << classname();                                                               \
-	  __PIVariantInfoStorage__::get()[type_id] = new __PIVariantInfo__(type_name, empty); \
-	STATIC_INITIALIZER_END
+#  define REGISTER_VARIANT(classname)                                                         \
+	  template<>                                                                              \
+	  inline PIString __PIVariantFunctions__<classname>::typeNameHelper() {                   \
+		  static PIString tn = PIStringAscii(#classname);                                     \
+		  return tn;                                                                          \
+	  }                                                                                       \
+	  template<>                                                                              \
+	  inline uint __PIVariantFunctions__<classname>::typeIDHelper() {                         \
+		  static uint ret = PIStringAscii(#classname).hash();                                 \
+		  return ret;                                                                         \
+	  }                                                                                       \
+	  REGISTER_VARIANT_TYPEINFO(classname)                                                    \
+	  STATIC_INITIALIZER_BEGIN                                                                \
+		  uint type_id       = __PIVariantFunctions__<classname>::typeIDHelper();             \
+		  PIString type_name = __PIVariantFunctions__<classname>::typeNameHelper();           \
+		  if (__PIVariantInfoStorage__::get().contains(type_id)) return;                      \
+		  PIByteArray empty;                                                                  \
+		  empty << classname();                                                               \
+		  __PIVariantInfoStorage__::get()[type_id] = new __PIVariantInfo__(type_name, empty); \
+	  STATIC_INITIALIZER_END
 
 
 #  define REGISTER_VARIANT_CAST_H(classname_from, classname_to) \
-	template<>                                                  \
-	template<>                                                  \
-	inline classname_to __PIVariantFunctions__<classname_from>::castVariant<classname_to>(const classname_from & v);
+	  template<>                                                \
+	  template<>                                                \
+	  inline classname_to __PIVariantFunctions__<classname_from>::castVariant<classname_to>(const classname_from & v);
 
 #  define REGISTER_VARIANT_CAST_CPP(classname_from, classname_to)                                                                         \
-	template<>                                                                                                                            \
-	template<>                                                                                                                            \
-	inline PIByteArray __PIVariantFunctions__<classname_from>::castHelper<classname_to>(PIByteArray v) {                                  \
-	  classname_from f;                                                                                                                   \
-	  v >> f;                                                                                                                             \
-	  classname_to t = __PIVariantFunctions__<classname_from>::castVariant<classname_to>(f);                                              \
-	  PIByteArray ret;                                                                                                                    \
-	  ret << t;                                                                                                                           \
-	  return ret;                                                                                                                         \
-	}                                                                                                                                     \
-	STATIC_INITIALIZER_BEGIN                                                                                                              \
-	  __PIVariantInfo__ * vi(__PIVariantInfoStorage__::get().value(__PIVariantFunctions__<classname_from>::typeIDHelper(), nullptr));     \
-	  if (!vi) {                                                                                                                          \
-		piCout << "Warning! Using REGISTER_VARIANT_CAST(" #classname_from ", " #classname_to ") before REGISTER_VARIANT(" #classname_from \
-				  "), ignore.";                                                                                                           \
-		return;                                                                                                                           \
+	  template<>                                                                                                                          \
+	  template<>                                                                                                                          \
+	  inline PIByteArray __PIVariantFunctions__<classname_from>::castHelper<classname_to>(PIByteArray v) {                                \
+		  classname_from f;                                                                                                               \
+		  v >> f;                                                                                                                         \
+		  classname_to t = __PIVariantFunctions__<classname_from>::castVariant<classname_to>(f);                                          \
+		  PIByteArray ret;                                                                                                                \
+		  ret << t;                                                                                                                       \
+		  return ret;                                                                                                                     \
 	  }                                                                                                                                   \
-	  vi->cast[__PIVariantFunctions__<classname_to>::typeIDHelper()] = __PIVariantFunctions__<classname_from>::castHelper<classname_to>;  \
-	STATIC_INITIALIZER_END                                                                                                                \
-	template<>                                                                                                                            \
-	template<>                                                                                                                            \
-	classname_to __PIVariantFunctions__<classname_from>::castVariant<classname_to>(const classname_from & v)
+	  STATIC_INITIALIZER_BEGIN                                                                                                            \
+		  __PIVariantInfo__ * vi(__PIVariantInfoStorage__::get().value(__PIVariantFunctions__<classname_from>::typeIDHelper(), nullptr)); \
+		  if (!vi) {                                                                                                                      \
+			  piCout << "Warning! Using REGISTER_VARIANT_CAST(" #classname_from ", " #classname_to                                        \
+						") before REGISTER_VARIANT(" #classname_from "), ignore.";                                                        \
+			  return;                                                                                                                     \
+		  }                                                                                                                               \
+		  vi->cast[__PIVariantFunctions__<classname_to>::typeIDHelper()] =                                                                \
+			  __PIVariantFunctions__<classname_from>::castHelper<classname_to>;                                                           \
+	  STATIC_INITIALIZER_END                                                                                                              \
+	  template<>                                                                                                                          \
+	  template<>                                                                                                                          \
+	  classname_to __PIVariantFunctions__<classname_from>::castVariant<classname_to>(const classname_from & v)
 
 #  define REGISTER_VARIANT_CAST(classname_from, classname_to) \
-	REGISTER_VARIANT_CAST_H(classname_from, classname_to)     \
-	REGISTER_VARIANT_CAST_CPP(classname_from, classname_to)
+	  REGISTER_VARIANT_CAST_H(classname_from, classname_to)   \
+	  REGISTER_VARIANT_CAST_CPP(classname_from, classname_to)
 
 
 #  define REGISTER_VARIANT_CAST_SIMPLE(classname_from, classname_to) \
-	REGISTER_VARIANT_CAST(classname_from, classname_to) { return classname_to(v); }
+	  REGISTER_VARIANT_CAST(classname_from, classname_to) {          \
+		  return classname_to(v);                                    \
+	  }
 #  define REGISTER_VARIANT_CAST_SIMPLE_H(classname_from, classname_to) REGISTER_VARIANT_CAST_H(classname_from, classname_to)
 #  define REGISTER_VARIANT_CAST_SIMPLE_CPP(classname_from, classname_to) \
-	REGISTER_VARIANT_CAST_CPP(classname_from, classname_to) { return classname_to(v); }
+	  REGISTER_VARIANT_CAST_CPP(classname_from, classname_to) {          \
+		  return classname_to(v);                                        \
+	  }
 
 #else
 
diff --git a/libs/main/units/piunits_base.h b/libs/main/units/piunits_base.h
index 6cf8d744..980ee471 100644
--- a/libs/main/units/piunits_base.h
+++ b/libs/main/units/piunits_base.h
@@ -81,9 +81,11 @@
 		bool supportPrefixesNon3(int type) const override;                      \
 		bool supportPrefixesGreater(int type) const override;                   \
 		bool supportPrefixesSmaller(int type) const override;                   \
-																				\
+                                                                                \
 	public:                                                                     \
-		PIString className() const override { return piTr(#Name, "PIUnits"); }  \
+		PIString className() const override {                                   \
+			return piTr(#Name, "PIUnits");                                      \
+		}                                                                       \
 		uint classID() const override {                                         \
 			static uint ret = PIStringAscii(#Name).hash();                      \
 			return ret;                                                         \
diff --git a/libs/main/units/piunits_class_angle.h b/libs/main/units/piunits_class_angle.h
index 055bd04c..30d62f36 100644
--- a/libs/main/units/piunits_class_angle.h
+++ b/libs/main/units/piunits_class_angle.h
@@ -42,9 +42,9 @@ DECLARE_UNIT_CLASS_BEGIN(Angle, 0x200)
 	//! \~english Supported angle unit type identifiers.
 	//! \~russian Поддерживаемые идентификаторы типов единиц угла.
 	enum {
-        Degree = typeStart /** \~english Degree \~russian Градус */,
-        Radian /** \~english Radian \~russian Радиан */,
-        _LastType
+		Degree = typeStart /** \~english Degree \~russian Градус */,
+		Radian /** \~english Radian \~russian Радиан */,
+		_LastType
 	};
 DECLARE_UNIT_CLASS_END(Angle)
 
diff --git a/libs/main/units/piunits_class_distance.h b/libs/main/units/piunits_class_distance.h
index 29221be1..a63bfabb 100644
--- a/libs/main/units/piunits_class_distance.h
+++ b/libs/main/units/piunits_class_distance.h
@@ -42,16 +42,16 @@ DECLARE_UNIT_CLASS_BEGIN(Distance, 0x600)
 	//! \~english Supported distance unit type identifiers.
 	//! \~russian Поддерживаемые идентификаторы типов единиц расстояния.
 	enum {
-        Meter = typeStart /** \~english Meter \~russian Метр */,
-        Inch /** \~english Inch \~russian Дюйм */,
-        Mil /** \~english Mil or thou \~russian Мил или thou */,
-        Foot /** \~english Foot \~russian Фут */,
-        Yard /** \~english Yard \~russian Ярд */,
+		Meter = typeStart /** \~english Meter \~russian Метр */,
+		Inch /** \~english Inch \~russian Дюйм */,
+		Mil /** \~english Mil or thou \~russian Мил или thou */,
+		Foot /** \~english Foot \~russian Фут */,
+		Yard /** \~english Yard \~russian Ярд */,
 
-        Angstrom /** \~english Angstrom \~russian Ангстрем */,
-        AstronomicalUnit /** \~english Astronomical unit \~russian Астрономическая единица */,
+		Angstrom /** \~english Angstrom \~russian Ангстрем */,
+		AstronomicalUnit /** \~english Astronomical unit \~russian Астрономическая единица */,
 
-        _LastType
+		_LastType
 	};
 DECLARE_UNIT_CLASS_END(Distance)
 
diff --git a/libs/main/units/piunits_class_information.h b/libs/main/units/piunits_class_information.h
index 8c4abbba..cda43240 100644
--- a/libs/main/units/piunits_class_information.h
+++ b/libs/main/units/piunits_class_information.h
@@ -44,7 +44,7 @@ DECLARE_UNIT_CLASS_BEGIN(Information, 0x100)
 	enum {
 		Bit = typeStart, /** \~english Bit \~russian Бит */
 		Byte,            /** \~english Byte \~russian Байт */
-		_LastType,       /** \~english Sentinel after the last unit type \~russian Служебное значение после последнего типа */
+		_LastType, /** \~english Sentinel after the last unit type \~russian Служебное значение после последнего типа */
 	};
 DECLARE_UNIT_CLASS_END(Information)
 
diff --git a/libs/main/units/piunits_class_mass.cpp b/libs/main/units/piunits_class_mass.cpp
index d651f25a..b97172e5 100644
--- a/libs/main/units/piunits_class_mass.cpp
+++ b/libs/main/units/piunits_class_mass.cpp
@@ -1,6 +1,6 @@
 /*
     PIP - Platform Independent Primitives
-	Mass units
+    Mass units
     Ivan Pelipenko peri4ko@yandex.ru
 
     This program is free software: you can redistribute it and/or modify
diff --git a/libs/main/units/piunits_class_mass.h b/libs/main/units/piunits_class_mass.h
index 685dfe8f..40eb7f75 100644
--- a/libs/main/units/piunits_class_mass.h
+++ b/libs/main/units/piunits_class_mass.h
@@ -42,10 +42,10 @@ DECLARE_UNIT_CLASS_BEGIN(Mass, 0x700)
 	//! \~english Supported mass unit type identifiers.
 	//! \~russian Поддерживаемые идентификаторы типов единиц массы.
 	enum {
-        Gram = typeStart /** \~english Gram \~russian Грамм */,
-        Pound /** \~english Pound \~russian Фунт */,
-        Ounce /** \~english Ounce \~russian Унция */,
-        _LastType
+		Gram = typeStart /** \~english Gram \~russian Грамм */,
+		Pound /** \~english Pound \~russian Фунт */,
+		Ounce /** \~english Ounce \~russian Унция */,
+		_LastType
 	};
 DECLARE_UNIT_CLASS_END(Mass)
 
diff --git a/libs/main/units/piunits_class_pressure.h b/libs/main/units/piunits_class_pressure.h
index 9818d859..ef021caf 100644
--- a/libs/main/units/piunits_class_pressure.h
+++ b/libs/main/units/piunits_class_pressure.h
@@ -42,11 +42,11 @@ DECLARE_UNIT_CLASS_BEGIN(Pressure, 0x500)
 	//! \~english Supported pressure unit type identifiers.
 	//! \~russian Поддерживаемые идентификаторы типов единиц давления.
 	enum {
-        Pascal = typeStart /** \~english Pascal \~russian Паскаль */,
-        Atmosphere /** \~english Standard atmosphere \~russian Стандартная атмосфера */,
-        Bar /** \~english Bar \~russian Бар */,
-        MillimetreOfMercury /** \~english Millimetre of mercury \~russian Миллиметр ртутного столба */,
-        _LastType
+		Pascal = typeStart /** \~english Pascal \~russian Паскаль */,
+		Atmosphere /** \~english Standard atmosphere \~russian Стандартная атмосфера */,
+		Bar /** \~english Bar \~russian Бар */,
+		MillimetreOfMercury /** \~english Millimetre of mercury \~russian Миллиметр ртутного столба */,
+		_LastType
 	};
 DECLARE_UNIT_CLASS_END(Pressure)
 
diff --git a/libs/main/units/piunits_class_temperature.h b/libs/main/units/piunits_class_temperature.h
index c0b463a1..bafb928a 100644
--- a/libs/main/units/piunits_class_temperature.h
+++ b/libs/main/units/piunits_class_temperature.h
@@ -42,10 +42,10 @@ DECLARE_UNIT_CLASS_BEGIN(Temperature, 0x400)
 	//! \~english Supported temperature unit type identifiers.
 	//! \~russian Поддерживаемые идентификаторы типов единиц температуры.
 	enum {
-        Kelvin = typeStart /** \~english Kelvin \~russian Кельвин */,
-        Celsius /** \~english Celsius \~russian Цельсий */,
-        Fahrenheit /** \~english Fahrenheit \~russian Фаренгейт */,
-        _LastType
+		Kelvin = typeStart /** \~english Kelvin \~russian Кельвин */,
+		Celsius /** \~english Celsius \~russian Цельсий */,
+		Fahrenheit /** \~english Fahrenheit \~russian Фаренгейт */,
+		_LastType
 	};
 DECLARE_UNIT_CLASS_END(Temperature)
 
diff --git a/libs/main/units/piunits_class_time.h b/libs/main/units/piunits_class_time.h
index c8ae2a15..4515d909 100644
--- a/libs/main/units/piunits_class_time.h
+++ b/libs/main/units/piunits_class_time.h
@@ -42,9 +42,9 @@ DECLARE_UNIT_CLASS_BEGIN(Time, 0x300)
 	//! \~english Supported time unit type identifiers.
 	//! \~russian Поддерживаемые идентификаторы типов единиц времени.
 	enum {
-        Second = typeStart /** \~english Second \~russian Секунда */,
-        Hertz /** \~english Hertz \~russian Герц */,
-        _LastType
+		Second = typeStart /** \~english Second \~russian Секунда */,
+		Hertz /** \~english Hertz \~russian Герц */,
+		_LastType
 	};
 DECLARE_UNIT_CLASS_END(Time)
 
diff --git a/libs/main/units/piunits_prefix.cpp b/libs/main/units/piunits_prefix.cpp
index 119e8b95..2e0e7f75 100644
--- a/libs/main/units/piunits_prefix.cpp
+++ b/libs/main/units/piunits_prefix.cpp
@@ -103,12 +103,12 @@ PIUnits::Prefix::Prefix() {
         {Yocto,  {"yocto"_tr ("PIUnits"), "y"_tr ("PIUnits") , -24, pow10(-24.), false}},
         {Ronto,  {"ronto"_tr ("PIUnits"), "r"_tr ("PIUnits") , -27, pow10(-27.), false}},
     };
-    // clang-format on
-    auto it    = prefixes.makeIterator();
-    while (it.next()) {
-        prefixes_by_pow[it.value().pow] = &it.value();
-    }
-    prefixes_by_pow[0] = &def_prefix;
+	// clang-format on
+	auto it    = prefixes.makeIterator();
+	while (it.next()) {
+		prefixes_by_pow[it.value().pow] = &it.value();
+	}
+	prefixes_by_pow[0] = &def_prefix;
 }
 
 
diff --git a/libs/mqtt_client/pimqttclient.cpp b/libs/mqtt_client/pimqttclient.cpp
index 133639e5..2ca53d46 100644
--- a/libs/mqtt_client/pimqttclient.cpp
+++ b/libs/mqtt_client/pimqttclient.cpp
@@ -1,20 +1,20 @@
 /*
-	PIP - Platform Independent Primitives
-	MQTT Client
-	Ivan Pelipenko peri4ko@yandex.ru
+    PIP - Platform Independent Primitives
+    MQTT Client
+    Ivan Pelipenko peri4ko@yandex.ru
 
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
 
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pimqttclient.h"
@@ -305,10 +305,10 @@ void PIMQTT::Client::connectInternal(const ConnectInfo & ci) {
 	PIString server_uri = "tcp://" + net_addr.toString();
 	MQTTClient_create(&PRIVATE->client, server_uri.dataAscii(), ci.clientID.dataUTF8(), MQTTCLIENT_PERSISTENCE_NONE, nullptr);
 	MQTTClient_setCallbacks(PRIVATE->client,
-							this,
-							PRIVATE->connectionLost_callback,
-							PRIVATE->messageArrived_callback,
-							PRIVATE->deliveryComplete_callback);
+	                        this,
+	                        PRIVATE->connectionLost_callback,
+	                        PRIVATE->messageArrived_callback,
+	                        PRIVATE->deliveryComplete_callback);
 	MQTTClient_connectOptions conn_opts = MQTTClient_connectOptions_initializer;
 	conn_opts.keepAliveInterval         = 9;
 	conn_opts.cleansession              = 1;
diff --git a/libs/opencl/piopencl.cpp b/libs/opencl/piopencl.cpp
index f9e602ed..cbb14a9b 100644
--- a/libs/opencl/piopencl.cpp
+++ b/libs/opencl/piopencl.cpp
@@ -89,8 +89,7 @@ void PIOpenCL::Initializer::init() {
 	cl_uint plat_num = 0;
 	ret              = clGetPlatformIDs(max_size, cl_platforms, &plat_num);
 	if (ret != 0) {
-		piCout << "[PIOpenCL]"
-			   << "Error: OpenCL platforms not found!"_tr("PIOpenCL");
+		piCout << "[PIOpenCL]" << "Error: OpenCL platforms not found!"_tr("PIOpenCL");
 		return;
 	}
 	for (uint i = 0; i < plat_num; i++) {
@@ -205,14 +204,12 @@ PIOpenCL::Context * PIOpenCL::Context::create(const PIOpenCL::DeviceList & dl) {
 	cl_int ret     = 0;
 	cl_context con = clCreateContext(0, cldl.size_s(), cldl.data(), 0, 0, &ret);
 	if (ret != 0) {
-		piCout << "[PIOpenCL::Context]"
-			   << "clCreateContext error" << ret;
+		piCout << "[PIOpenCL::Context]" << "clCreateContext error" << ret;
 		return 0;
 	}
 	cl_command_queue comq = clCreateCommandQueue(con, cldl[0], 0, &ret);
 	if (ret != 0) {
-		piCout << "[PIOpenCL::Context]"
-			   << "clCreateCommandQueue error" << ret;
+		piCout << "[PIOpenCL::Context]" << "clCreateCommandQueue error" << ret;
 		clReleaseContext(con);
 		return 0;
 	}
@@ -253,8 +250,7 @@ PIOpenCL::Program * PIOpenCL::Context::createProgram(const PIString & source, co
 	cl_int ret                 = 0;
 	cl_program prog            = clCreateProgramWithSource(PRIVATE->context, 1, &csrc, &src_size, &ret);
 	if (ret != 0) {
-		piCout << "[PIOpenCL::Context]"
-			   << "clCreateProgramWithSource error" << ret;
+		piCout << "[PIOpenCL::Context]" << "clCreateProgramWithSource error" << ret;
 		if (error) (*error) += "clCreateProgramWithSource error " + PIString::fromNumber(ret);
 		return 0;
 	}
@@ -264,8 +260,7 @@ PIOpenCL::Program * PIOpenCL::Context::createProgram(const PIString & source, co
 	clGetProgramBuildInfo(prog, PRIVATE->devices[0], CL_PROGRAM_BUILD_LOG, sizeof(buffer), buffer, 0);
 	if (ret != 0) {
 		clReleaseProgram(prog);
-		piCout << "[PIOpenCL::Context]"
-			   << "clBuildProgram error" << ret; // << ":" << buffer;
+		piCout << "[PIOpenCL::Context]" << "clBuildProgram error" << ret; // << ":" << buffer;
 		if (error) (*error) = buffer;
 		return 0;
 	}
@@ -273,8 +268,7 @@ PIOpenCL::Program * PIOpenCL::Context::createProgram(const PIString & source, co
 	ret         = clGetProgramInfo(prog, CL_PROGRAM_NUM_KERNELS, sizeof(uret), &uret, 0);
 	if (ret != 0) {
 		clReleaseProgram(prog);
-		piCout << "[PIOpenCL::Context]"
-			   << "clGetProgramInfo error" << ret;
+		piCout << "[PIOpenCL::Context]" << "clGetProgramInfo error" << ret;
 		if (error) (*error) = "Can`t retrieve CL_PROGRAM_NUM_KERNELS";
 		return 0;
 	}
@@ -283,8 +277,7 @@ PIOpenCL::Program * PIOpenCL::Context::createProgram(const PIString & source, co
 	ret = clGetProgramInfo(prog, CL_PROGRAM_KERNEL_NAMES, ccnt, knames, 0);
 	if (ret != 0) {
 		clReleaseProgram(prog);
-		piCout << "[PIOpenCL::Context]"
-			   << "clGetProgramInfo error" << ret;
+		piCout << "[PIOpenCL::Context]" << "clGetProgramInfo error" << ret;
 		if (error) (*error) = "Can`t retrieve CL_PROGRAM_KERNEL_NAMES";
 		return 0;
 	}
@@ -293,8 +286,7 @@ PIOpenCL::Program * PIOpenCL::Context::createProgram(const PIString & source, co
 	for (const auto & k: knl) {
 		cl_kernel kern = clCreateKernel(prog, k.dataAscii(), &ret);
 		if (ret != 0) {
-			piCout << "[PIOpenCL::Context]"
-				   << "clCreateKernel" << k << "error" << ret;
+			piCout << "[PIOpenCL::Context]" << "clCreateKernel" << k << "error" << ret;
 			if (error) (*error) += "clCreateKernel(\"" + k + "\") error " + ret;
 			for (auto * _k: kerns)
 				clReleaseKernel((cl_kernel)_k);
@@ -370,8 +362,7 @@ bool PIOpenCL::Buffer::init() {
 	}
 	PRIVATE->buffer = clCreateBuffer(context_->PRIVATEWB->context, f, elements * def.size(), container ? containerData() : 0, &ret);
 	if (ret != 0) {
-		piCout << "[PIOpenCL::Buffer]"
-			   << "clCreateBuffer error" << ret;
+		piCout << "[PIOpenCL::Buffer]" << "clCreateBuffer error" << ret;
 		return false;
 	}
 	return true;
@@ -396,8 +387,7 @@ void PIOpenCL::Buffer::clear() {
 	cl_int ret =
 		clEnqueueFillBuffer(context_->PRIVATEWB->queue, PRIVATE->buffer, def.data(), def.size_s(), 0, elements * def.size(), 0, 0, 0);
 	if (ret != 0) {
-		piCout << "[PIOpenCL::Buffer]"
-			   << "clEnqueueFillBuffer error" << ret;
+		piCout << "[PIOpenCL::Buffer]" << "clEnqueueFillBuffer error" << ret;
 	}
 }
 
@@ -412,8 +402,7 @@ void PIOpenCL::Buffer::copyTo(void * data) {
 	if (!PRIVATE->buffer) return;
 	cl_int ret = clEnqueueReadBuffer(context_->PRIVATEWB->queue, PRIVATE->buffer, CL_TRUE, 0, elements * def.size(), data, 0, 0, 0);
 	if (ret != 0) {
-		piCout << "[PIOpenCL::Buffer]"
-			   << "clEnqueueReadBuffer error" << ret;
+		piCout << "[PIOpenCL::Buffer]" << "clEnqueueReadBuffer error" << ret;
 	}
 }
 
@@ -430,8 +419,7 @@ void PIOpenCL::Buffer::copyTo(void * data, int elements_count, int elements_offs
 	                                 0,
 	                                 0);
 	if (ret != 0) {
-		piCout << "[PIOpenCL::Buffer]"
-			   << "clEnqueueReadBuffer error" << ret;
+		piCout << "[PIOpenCL::Buffer]" << "clEnqueueReadBuffer error" << ret;
 	}
 }
 
@@ -451,8 +439,7 @@ void PIOpenCL::Buffer::copyFrom(void * data) {
 	if (!PRIVATE->buffer) return;
 	cl_int ret = clEnqueueWriteBuffer(context_->PRIVATEWB->queue, PRIVATE->buffer, CL_TRUE, 0, elements * def.size(), data, 0, 0, 0);
 	if (ret != 0) {
-		piCout << "[PIOpenCL::Buffer]"
-			   << "clEnqueueWriteBuffer error" << ret;
+		piCout << "[PIOpenCL::Buffer]" << "clEnqueueWriteBuffer error" << ret;
 	}
 }
 
@@ -469,8 +456,7 @@ void PIOpenCL::Buffer::copyFrom(void * data, int elements_count, int elements_fr
 	                                  0,
 	                                  0);
 	if (ret != 0) {
-		piCout << "[PIOpenCL::Buffer]"
-			   << "clEnqueueWriteBuffer error" << ret;
+		piCout << "[PIOpenCL::Buffer]" << "clEnqueueWriteBuffer error" << ret;
 	}
 }
 
@@ -498,8 +484,7 @@ void PIOpenCL::Buffer::copy(Buffer * buffer_from,
 	                                 nullptr,
 	                                 nullptr);
 	if (ret != 0) {
-		piCout << "[PIOpenCL::Buffer]"
-			   << "clEnqueueCopyBuffer error" << ret;
+		piCout << "[PIOpenCL::Buffer]" << "clEnqueueCopyBuffer error" << ret;
 	}
 }
 
@@ -546,14 +531,12 @@ bool PIOpenCL::Program::initKernels(PIVector<void *> kerns) {
 
 bool PIOpenCL::Kernel::execute() {
 	if (dims.isEmpty()) {
-		piCout << "[PIOpenCL::Kernel]"
-			   << "Error: empty range"_tr("PIOpenCL");
+		piCout << "[PIOpenCL::Kernel]" << "Error: empty range"_tr("PIOpenCL");
 		return false;
 	}
 	cl_int ret = clEnqueueNDRangeKernel(context_->PRIVATEWB->queue, PRIVATE->kernel, dims.size(), 0, dims.data(), 0, 0, 0, 0);
 	if (ret != 0) {
-		piCout << "[PIOpenCL::Kernel]"
-			   << "clEnqueueNDRangeKernel error" << ret;
+		piCout << "[PIOpenCL::Kernel]" << "clEnqueueNDRangeKernel error" << ret;
 		return false;
 	}
 	return true;
@@ -593,16 +576,14 @@ bool PIOpenCL::Kernel::init() {
 	cl_int ret = 0;
 	ret        = clGetKernelInfo(PRIVATE->kernel, CL_KERNEL_FUNCTION_NAME, 1024, kname, 0);
 	if (ret != 0) {
-		piCout << "[PIOpenCL::Kernel]"
-			   << "clGetKernelInfo(CL_KERNEL_FUNCTION_NAME) error" << ret;
+		piCout << "[PIOpenCL::Kernel]" << "clGetKernelInfo(CL_KERNEL_FUNCTION_NAME) error" << ret;
 		return false;
 	}
 	name_      = kname;
 	cl_uint na = 0;
 	ret        = clGetKernelInfo(PRIVATE->kernel, CL_KERNEL_NUM_ARGS, sizeof(na), &na, 0);
 	if (ret != 0) {
-		piCout << "[PIOpenCL::Kernel]"
-			   << "clGetKernelInfo(CL_KERNEL_NUM_ARGS) error" << ret;
+		piCout << "[PIOpenCL::Kernel]" << "clGetKernelInfo(CL_KERNEL_NUM_ARGS) error" << ret;
 		return false;
 	}
 	for (cl_uint i = 0; i < na; ++i) {
@@ -623,14 +604,12 @@ void setArgV(cl_kernel k, int index, T v) {
 
 bool PIOpenCL::Kernel::setArgValueS(int index, const PIVariant & value) {
 	if (index < 0 || index >= args_.size_s()) {
-		piCout << "[PIOpenCL::Kernel]"
-			   << "setArgValue invalid index %1"_tr("PIOpenCL").arg(index);
+		piCout << "[PIOpenCL::Kernel]" << "setArgValue invalid index %1"_tr("PIOpenCL").arg(index);
 		return false;
 	}
 	KernelArg & ka(args_[index]);
 	if (ka.dims > 0) {
-		piCout << "[PIOpenCL::Kernel]"
-			   << "setArgValue set scalar to \"%1 %2\""_tr("PIOpenCL").arg(ka.type_name).arg(ka.arg_name);
+		piCout << "[PIOpenCL::Kernel]" << "setArgValue set scalar to \"%1 %2\""_tr("PIOpenCL").arg(ka.type_name).arg(ka.arg_name);
 		return false;
 	}
 	switch (ka.arg_type) {
@@ -653,14 +632,12 @@ bool PIOpenCL::Kernel::setArgValueS(int index, const PIVariant & value) {
 bool PIOpenCL::Kernel::bindArgValue(int index, Buffer * buffer) {
 	if (!buffer) return false;
 	if (index < 0 || index >= args_.size_s()) {
-		piCout << "[PIOpenCL::Kernel]"
-			   << "bindArgValue invalid index %1"_tr("PIOpenCL").arg(index);
+		piCout << "[PIOpenCL::Kernel]" << "bindArgValue invalid index %1"_tr("PIOpenCL").arg(index);
 		return false;
 	}
 	KernelArg & ka(args_[index]);
 	if (ka.dims <= 0) {
-		piCout << "[PIOpenCL::Kernel]"
-			   << "bindArgValue set buffer to \"%1 %2\""_tr("PIOpenCL").arg(ka.type_name).arg(ka.arg_name);
+		piCout << "[PIOpenCL::Kernel]" << "bindArgValue set buffer to \"%1 %2\""_tr("PIOpenCL").arg(ka.type_name).arg(ka.arg_name);
 		return false;
 	}
 	clSetKernelArg(PRIVATE->kernel, index, sizeof(buffer->PRIVATEWB->buffer), &(buffer->PRIVATEWB->buffer));
@@ -699,22 +676,19 @@ void PIOpenCL::KernelArg::init(void * _k, uint index) {
 	piZeroMemory(nm, 1024);
 	ret = clGetKernelArgInfo(k, index, CL_KERNEL_ARG_TYPE_NAME, 1024, nm, 0);
 	if (ret != 0) {
-		piCout << "[PIOpenCL::Kernel]"
-			   << "clGetKernelArgInfo(CL_KERNEL_ARG_TYPE_NAME) error" << ret;
+		piCout << "[PIOpenCL::Kernel]" << "clGetKernelArgInfo(CL_KERNEL_ARG_TYPE_NAME) error" << ret;
 	}
 	type_name = nm;
 	piZeroMemory(nm, 1024);
 	ret = clGetKernelArgInfo(k, index, CL_KERNEL_ARG_NAME, 1024, nm, 0);
 	if (ret != 0) {
-		piCout << "[PIOpenCL::Kernel]"
-			   << "clGetKernelArgInfo(CL_KERNEL_ARG_NAME) error" << ret;
+		piCout << "[PIOpenCL::Kernel]" << "clGetKernelArgInfo(CL_KERNEL_ARG_NAME) error" << ret;
 	}
 	arg_name                             = nm;
 	cl_kernel_arg_address_qualifier addq = 0;
 	ret                                  = clGetKernelArgInfo(k, index, CL_KERNEL_ARG_ADDRESS_QUALIFIER, sizeof(addq), &addq, 0);
 	if (ret != 0) {
-		piCout << "[PIOpenCL::Kernel]"
-			   << "clGetKernelArgInfo(CL_KERNEL_ARG_ADDRESS_QUALIFIER) error" << ret;
+		piCout << "[PIOpenCL::Kernel]" << "clGetKernelArgInfo(CL_KERNEL_ARG_ADDRESS_QUALIFIER) error" << ret;
 	}
 	switch (addq) {
 	case CL_KERNEL_ARG_ADDRESS_GLOBAL: address_qualifier = AddressGlobal; break;
@@ -725,8 +699,7 @@ void PIOpenCL::KernelArg::init(void * _k, uint index) {
 	cl_kernel_arg_access_qualifier accq = 0;
 	ret                                 = clGetKernelArgInfo(k, index, CL_KERNEL_ARG_ACCESS_QUALIFIER, sizeof(accq), &accq, 0);
 	if (ret != 0) {
-		piCout << "[PIOpenCL::Kernel]"
-			   << "clGetKernelArgInfo(CL_KERNEL_ARG_ACCESS_QUALIFIER) error" << ret;
+		piCout << "[PIOpenCL::Kernel]" << "clGetKernelArgInfo(CL_KERNEL_ARG_ACCESS_QUALIFIER) error" << ret;
 	}
 	switch (accq) {
 	case CL_KERNEL_ARG_ACCESS_READ_ONLY: access_qualifier = AccessReadOnly; break;
@@ -737,8 +710,7 @@ void PIOpenCL::KernelArg::init(void * _k, uint index) {
 	cl_kernel_arg_type_qualifier tq = 0;
 	ret                             = clGetKernelArgInfo(k, index, CL_KERNEL_ARG_TYPE_QUALIFIER, sizeof(tq), &tq, 0);
 	if (ret != 0) {
-		piCout << "[PIOpenCL::Kernel]"
-			   << "clGetKernelArgInfo(CL_KERNEL_ARG_TYPE_QUALIFIER) error" << ret;
+		piCout << "[PIOpenCL::Kernel]" << "clGetKernelArgInfo(CL_KERNEL_ARG_TYPE_QUALIFIER) error" << ret;
 	}
 	switch (tq) {
 	case CL_KERNEL_ARG_TYPE_CONST: type_qualifier = TypeConst; break;
diff --git a/libs/usb/piusb.cpp b/libs/usb/piusb.cpp
index c45070ee..a2577e7c 100644
--- a/libs/usb/piusb.cpp
+++ b/libs/usb/piusb.cpp
@@ -300,7 +300,7 @@ bool PIUSB::openDevice() {
 			piCoutObj << "Error: Cant`t detach bounded driver!";
 			return false;
 		} // else piCoutObj << "ok";
-	}     // else piCoutObj << "no";
+	} // else piCoutObj << "no";
 #  endif
 
 	// piCoutObj << "Claim interface ... " << flush;
@@ -392,17 +392,12 @@ PICout operator<<(PICout s, const PIUSB::Endpoint & v) {
 	s.saveAndSetControls(0);
 	s << PICoutManipulators::NewLine << "{" << PICoutManipulators::NewLine;
 	if (v.isNull())
-		s << "  "
-		  << "Null Endpoint";
+		s << "  " << "Null Endpoint";
 	else {
-		s << "  "
-		  << "Address: " << v.address << PICoutManipulators::NewLine;
-		s << "  "
-		  << "Attributes: " << v.attributes << PICoutManipulators::NewLine;
-		s << "    "
-		  << "Direction: " << (v.direction == PIUSB::Endpoint::Write ? "Write" : "Read") << PICoutManipulators::NewLine;
-		s << "    "
-		  << "Transfer Type: ";
+		s << "  " << "Address: " << v.address << PICoutManipulators::NewLine;
+		s << "  " << "Attributes: " << v.attributes << PICoutManipulators::NewLine;
+		s << "    " << "Direction: " << (v.direction == PIUSB::Endpoint::Write ? "Write" : "Read") << PICoutManipulators::NewLine;
+		s << "    " << "Transfer Type: ";
 		switch (v.transfer_type) {
 		case PIUSB::Endpoint::Control: s << "Control" << PICoutManipulators::NewLine; break;
 		case PIUSB::Endpoint::Bulk: s << "Bulk" << PICoutManipulators::NewLine; break;
@@ -411,8 +406,7 @@ PICout operator<<(PICout s, const PIUSB::Endpoint & v) {
 		default: break;
 		}
 		if (v.transfer_type == PIUSB::Endpoint::Isochronous) {
-			s << "    "
-			  << "Synchronisation Type: ";
+			s << "    " << "Synchronisation Type: ";
 			switch (v.synchronisation_type) {
 			case PIUSB::Endpoint::NoSynchonisation: s << "No Synchonisation" << PICoutManipulators::NewLine; break;
 			case PIUSB::Endpoint::Asynchronous: s << "Asynchronous" << PICoutManipulators::NewLine; break;
@@ -420,8 +414,7 @@ PICout operator<<(PICout s, const PIUSB::Endpoint & v) {
 			case PIUSB::Endpoint::Synchronous: s << "Synchronous" << PICoutManipulators::NewLine; break;
 			default: break;
 			}
-			s << "    "
-			  << "Usage Type: ";
+			s << "    " << "Usage Type: ";
 			switch (v.usage_type) {
 			case PIUSB::Endpoint::DataEndpoint: s << "Data Endpoint" << PICoutManipulators::NewLine; break;
 			case PIUSB::Endpoint::FeedbackEndpoint: s << "Feedback Endpoint" << PICoutManipulators::NewLine; break;
@@ -431,8 +424,7 @@ PICout operator<<(PICout s, const PIUSB::Endpoint & v) {
 			default: break;
 			}
 		}
-		s << "  "
-		  << "Max Packet Size: " << v.max_packet_size << PICoutManipulators::NewLine;
+		s << "  " << "Max Packet Size: " << v.max_packet_size << PICoutManipulators::NewLine;
 	}
 	s << "}" << PICoutManipulators::NewLine;
 	s.restoreControls();
diff --git a/main.cpp b/main.cpp
index 6550c43a..b74566dd 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,109 +1,109 @@
-#include "libs/http_client/curl_thread_pool_p.h"
-#include "picodeparser.h"
-#include "pidigest.h"
-#include "pihttpclient.h"
-#include "piliterals.h"
-#include "pimqttclient.h"
-#include "pip.h"
-#include "piunits.h"
-#include "pivaluetree_conversions.h"
-
-using namespace PICoutManipulators;
-using namespace PIHTTP;
-
-
-PIKbdListener kbd;
-
-MessageMutable createMessage(Code c, const char * path, const MessageConst & msg) {
-	piCout << "path" << path << "args" << msg.pathArguments();
-	return MessageMutable().setCode(c);
-};
-int main(int argc, char * argv[]) {
-	// piCout << "start ...";
-	// PIHTTPServer server;
-	// server.registerUnhandled([](const MessageConst & msg) { return createMessage(Code::BadRequest, "unhadled", msg); });
-	// server.registerPath("api/v1/status", Method::Get, [](const MessageConst & msg) {
-	// 	return createMessage(Code::Accepted, "api/v1/status", msg);
-	// });
-	// server.registerPath("api/v1/plugins", Method::Get, [](const MessageConst & msg) {
-	// 	return createMessage(Code::Accepted, "api/v1/plugins", msg);
-	// });
-	// server.registerPath("api/v1/task-status", Method::Get, [](const MessageConst & msg) {
-	// 	return createMessage(Code::Accepted, "api/v1/task-status", msg);
-	// });
-	// server.registerPath("api/v1/task/{taskID}/status", Method::Get, [](const MessageConst & msg) {
-	// 	return createMessage(Code::Accepted, "api/v1/task/{taskID}/status", msg);
-	// });
-	// server.registerPath("api/v1/bort/list", Method::Get, [](const MessageConst & msg) {
-	// 	return createMessage(Code::Accepted, "api/v1/bort/list", msg);
-	// });
-	// server.registerPath("api/v1/all", Method::Get, [](const MessageConst & msg) {
-	// 	return createMessage(Code::Accepted, "api/v1/all", msg);
-	// });
-	// server.registerPath("api/v1/all/bort{A}/f", Method::Get, [](const MessageConst & msg) {
-	// 	return createMessage(Code::Accepted, "api/v1/all/*/f", msg);
-	// });
-	// server.registerPath("api/v1/all2/**", Method::Get, [](const MessageConst & msg) {
-	// 	return createMessage(Code::Accepted, "api/v1/all2/**", msg);
-	// });
-	// server.listenAll(12345);
-
-	// kbd.enableExitCapture('Q');
-	// WAIT_FOR_EXIT
-	// piCout << "exiting ...";
-	// server.stop();
-
-	// return 0;
-
-	// PISystemMonitor mon;
-	// mon.startOnSelf();
-	// PISystemMonitor::totalRAM();
-	// 2_s .sleep();
-
-	// return 0;
-	PIMQTT::Client cl;
-	cl.setConnectTimeout(2_s);
-
-	cl.subscribe("api/v1/all/bort{A}/f",
-				 [](const PIMQTT::MessageConst & msg) { piCout << "1" << msg.topicList() << msg.pathArguments() << msg.body().size(); });
-	cl.subscribe("api/v1/all/task{T}/f",
-				 [](const PIMQTT::MessageConst & msg) { piCout << "2" << msg.topicList() << msg.pathArguments() << msg.body().size(); });
-	cl.subscribe("api/v1/all/*/f",
-				 [](const PIMQTT::MessageConst & msg) { piCout << "3" << msg.topicList() << msg.pathArguments() << msg.body().size(); });
-	cl.subscribe("api/v1/all2/**",
-				 [](const PIMQTT::MessageConst & msg) { piCout << "4" << msg.topicList() << msg.pathArguments() << msg.body().size(); });
-	CONNECTL(&cl, connected, [&cl] {
-		piCout << "connected";
-		// cl.subscribe("api/v1/plugins");
-		// cl.subscribe("api/v1/task-status");
-		// cl.subscribe("api/v1/*/{taskID}/status");
-		// cl.subscribe("api/v1/bort/list");
-		// cl.subscribe("api/v1/all");
-		// cl.subscribe("/zigbee2mqtt");
-		// cl.subscribe("/zigbee2mqtt/+/status/");
-		// cl.subscribe("/zigbee2mqtt/*/status/");
-		// cl.subscribe("test/#");
-		// cl.subscribe("#");
-		// cl.unsubscribe("/zigbee2mqtt");
-		// cl.unsubscribe("api/v1/all/bort{A}/f");
-		// cl.unsubscribe("api/v1/all/*/f");
-		// cl.publish("/zigbee2mqtt/abc", "hello from PIP"_a.toAscii());
-	});
-	CONNECTL(&cl, disconnected, [&cl](PIMQTT::Error code) {
-		piCout << "disconnected code" << (int)code;
-		cl.connect("localhost", "PIP");
-	});
-	CONNECTL(&cl, receivedUnhandled, [](const PIMQTT::MessageConst & message) {
-		piCout << "receivedUnhandled" << message.topic() << message.pathArguments() << message.payload().size();
-	});
-
-	cl.connect("localhost", "PIP");
-
-	piSleep(6.);
-	cl.unsubscribeAll();
-
-	kbd.enableExitCapture('Q');
-	WAIT_FOR_EXIT
-
-	piCout << "exiting ...";
-}
+#include "libs/http_client/curl_thread_pool_p.h"
+#include "picodeparser.h"
+#include "pidigest.h"
+#include "pihttpclient.h"
+#include "piliterals.h"
+#include "pimqttclient.h"
+#include "pip.h"
+#include "piunits.h"
+#include "pivaluetree_conversions.h"
+
+using namespace PICoutManipulators;
+using namespace PIHTTP;
+
+
+PIKbdListener kbd;
+
+MessageMutable createMessage(Code c, const char * path, const MessageConst & msg) {
+	piCout << "path" << path << "args" << msg.pathArguments();
+	return MessageMutable().setCode(c);
+};
+int main(int argc, char * argv[]) {
+	// piCout << "start ...";
+	// PIHTTPServer server;
+	// server.registerUnhandled([](const MessageConst & msg) { return createMessage(Code::BadRequest, "unhadled", msg); });
+	// server.registerPath("api/v1/status", Method::Get, [](const MessageConst & msg) {
+	// 	return createMessage(Code::Accepted, "api/v1/status", msg);
+	// });
+	// server.registerPath("api/v1/plugins", Method::Get, [](const MessageConst & msg) {
+	// 	return createMessage(Code::Accepted, "api/v1/plugins", msg);
+	// });
+	// server.registerPath("api/v1/task-status", Method::Get, [](const MessageConst & msg) {
+	// 	return createMessage(Code::Accepted, "api/v1/task-status", msg);
+	// });
+	// server.registerPath("api/v1/task/{taskID}/status", Method::Get, [](const MessageConst & msg) {
+	// 	return createMessage(Code::Accepted, "api/v1/task/{taskID}/status", msg);
+	// });
+	// server.registerPath("api/v1/bort/list", Method::Get, [](const MessageConst & msg) {
+	// 	return createMessage(Code::Accepted, "api/v1/bort/list", msg);
+	// });
+	// server.registerPath("api/v1/all", Method::Get, [](const MessageConst & msg) {
+	// 	return createMessage(Code::Accepted, "api/v1/all", msg);
+	// });
+	// server.registerPath("api/v1/all/bort{A}/f", Method::Get, [](const MessageConst & msg) {
+	// 	return createMessage(Code::Accepted, "api/v1/all/*/f", msg);
+	// });
+	// server.registerPath("api/v1/all2/**", Method::Get, [](const MessageConst & msg) {
+	// 	return createMessage(Code::Accepted, "api/v1/all2/**", msg);
+	// });
+	// server.listenAll(12345);
+
+	// kbd.enableExitCapture('Q');
+	// WAIT_FOR_EXIT
+	// piCout << "exiting ...";
+	// server.stop();
+
+	// return 0;
+
+	// PISystemMonitor mon;
+	// mon.startOnSelf();
+	// PISystemMonitor::totalRAM();
+	// 2_s .sleep();
+
+	// return 0;
+	PIMQTT::Client cl;
+	cl.setConnectTimeout(2_s);
+
+	cl.subscribe("api/v1/all/bort{A}/f",
+	             [](const PIMQTT::MessageConst & msg) { piCout << "1" << msg.topicList() << msg.pathArguments() << msg.body().size(); });
+	cl.subscribe("api/v1/all/task{T}/f",
+	             [](const PIMQTT::MessageConst & msg) { piCout << "2" << msg.topicList() << msg.pathArguments() << msg.body().size(); });
+	cl.subscribe("api/v1/all/*/f",
+	             [](const PIMQTT::MessageConst & msg) { piCout << "3" << msg.topicList() << msg.pathArguments() << msg.body().size(); });
+	cl.subscribe("api/v1/all2/**",
+	             [](const PIMQTT::MessageConst & msg) { piCout << "4" << msg.topicList() << msg.pathArguments() << msg.body().size(); });
+	CONNECTL(&cl, connected, [&cl] {
+		piCout << "connected";
+		// cl.subscribe("api/v1/plugins");
+		// cl.subscribe("api/v1/task-status");
+		// cl.subscribe("api/v1/*/{taskID}/status");
+		// cl.subscribe("api/v1/bort/list");
+		// cl.subscribe("api/v1/all");
+		// cl.subscribe("/zigbee2mqtt");
+		// cl.subscribe("/zigbee2mqtt/+/status/");
+		// cl.subscribe("/zigbee2mqtt/*/status/");
+		// cl.subscribe("test/#");
+		// cl.subscribe("#");
+		// cl.unsubscribe("/zigbee2mqtt");
+		// cl.unsubscribe("api/v1/all/bort{A}/f");
+		// cl.unsubscribe("api/v1/all/*/f");
+		// cl.publish("/zigbee2mqtt/abc", "hello from PIP"_a.toAscii());
+	});
+	CONNECTL(&cl, disconnected, [&cl](PIMQTT::Error code) {
+		piCout << "disconnected code" << (int)code;
+		cl.connect("localhost", "PIP");
+	});
+	CONNECTL(&cl, receivedUnhandled, [](const PIMQTT::MessageConst & message) {
+		piCout << "receivedUnhandled" << message.topic() << message.pathArguments() << message.payload().size();
+	});
+
+	cl.connect("localhost", "PIP");
+
+	piSleep(6.);
+	cl.unsubscribeAll();
+
+	kbd.enableExitCapture('Q');
+	WAIT_FOR_EXIT
+
+	piCout << "exiting ...";
+}
diff --git a/main_tcp_server.cpp b/main_tcp_server.cpp
index b7179c2e..348bc938 100644
--- a/main_tcp_server.cpp
+++ b/main_tcp_server.cpp
@@ -80,7 +80,7 @@ void keyEvent(char key, void *) {
 	};
 };
 
-void timerEvent(void *, int){
+void timerEvent(void *, int) {
 	// sl.send();
 };
 
diff --git a/tests/io/testpifile.cpp b/tests/io/testpifile.cpp
index 33944763..a4c28118 100644
--- a/tests/io/testpifile.cpp
+++ b/tests/io/testpifile.cpp
@@ -11,4 +11,3 @@ TEST(PIFile_Test, openTemporary) {
 	ASSERT_EQ(ba, f.readAll());
 	ASSERT_TRUE(f.close());
 }
-
diff --git a/tests/math/testpivector2d.cpp b/tests/math/testpivector2d.cpp
index a744becc..a2a217e2 100644
--- a/tests/math/testpivector2d.cpp
+++ b/tests/math/testpivector2d.cpp
@@ -490,7 +490,7 @@ TEST_F(Vector2DTest, appendColumns_single_column) {
 
 	// Check new column
 	for (size_t r = 0; r < vec.rows(); ++r) {
-            EXPECT_EQ(vec.element(r, oldVec.cols()), 77);
+		EXPECT_EQ(vec.element(r, oldVec.cols()), 77);
 	}
 }
 
@@ -540,7 +540,7 @@ TEST_F(Vector2DTest, deleteRows_at_end_works) {
 TEST_F(Vector2DTest, deleteRows_beyond_bounds_is_limited) {
 	size_t oldRows = vec.rows();
 	size_t oldCols = vec.cols();
-	size_t count = 10;
+	size_t count   = 10;
 
 	vec.deleteRows(oldRows - 2, count);
 
@@ -557,7 +557,7 @@ TEST_F(Vector2DTest, deleteRows_beyond_bounds_is_limited) {
 	// All new rows should have original content
 	for (size_t r = oldRows; r < vec.rows(); ++r) {
 		for (size_t c = 0; c < vec.cols(); ++c) {
-			EXPECT_EQ(vec.element(r, c), static_cast<int>((r+count) * COLS_COUNT_INIT + c));
+			EXPECT_EQ(vec.element(r, c), static_cast<int>((r + count) * COLS_COUNT_INIT + c));
 		}
 	}
 }
@@ -674,7 +674,7 @@ TEST_F(Vector2DTest, addColumn_appends_column_to_existing) {
 	size_t oldRows = vec.rows();
 	size_t oldCols = vec.cols();
 
-	PIVector<int> newCol(oldRows, [](size_t i){return -900 - (int)i;});
+	PIVector<int> newCol(oldRows, [](size_t i) { return -900 - (int)i; });
 	vec.addColumn(newCol);
 
 	EXPECT_EQ(vec.rows(), oldRows);
diff --git a/tests/thread/piprotectedvariable_test.cpp b/tests/thread/piprotectedvariable_test.cpp
index e7facc40..76299c57 100644
--- a/tests/thread/piprotectedvariable_test.cpp
+++ b/tests/thread/piprotectedvariable_test.cpp
@@ -1,7 +1,7 @@
+#include "piliterals_time.h"
 #include "piprotectedvariable.h"
 #include "pistring.h"
 #include "pithread.h"
-#include "piliterals_time.h"
 
 #include "gtest/gtest.h"
 #include <atomic>
@@ -103,8 +103,8 @@ TEST(PIProtectedVariable_ThreadSafety, ConcurrentReadWrite) {
 		}));
 	}
 
-	threads.forEach([](PIThread * & t) {t->startOnce();});
-	threads.forEach([](PIThread * & t) {t->waitForFinish(2_s);});
+	threads.forEach([](PIThread *& t) { t->startOnce(); });
+	threads.forEach([](PIThread *& t) { t->waitForFinish(2_s); });
 	piDeleteAll(threads);
 
 	// Verify results
diff --git a/utils/cloud_dispatcher/cloudserver.cpp b/utils/cloud_dispatcher/cloudserver.cpp
index dad98355..549bc867 100644
--- a/utils/cloud_dispatcher/cloudserver.cpp
+++ b/utils/cloud_dispatcher/cloudserver.cpp
@@ -75,8 +75,7 @@ void CloudServer::stop() {
 
 void CloudServer::printStatus() {
 	PIMutexLocker locker(mutex_clients);
-	piCout << "    "
-		   << "Clients for" << server->address() << server_uuid.toHex() << ":";
+	piCout << "    " << "Clients for" << server->address() << server_uuid.toHex() << ":";
 	for (auto c: clients) {
 		piCout << "        " << c->address() << c->clientId();
 	}
diff --git a/utils/code_model_generator/main.cpp b/utils/code_model_generator/main.cpp
old mode 100755
new mode 100644
index 611028c2..9048c289
--- a/utils/code_model_generator/main.cpp
+++ b/utils/code_model_generator/main.cpp
@@ -194,7 +194,7 @@ bool writeModel(PICodeParser & parser,
 		ts << "\n\n// JSON serialization\n";
 		for (const PICodeParser::Entity * e: parser.entities) {
 			if (e->is_anonymous || e->name.startsWith("_PI") ||
-				!(e->visibility == PICodeParser::Global || e->visibility == PICodeParser::Public))
+			    !(e->visibility == PICodeParser::Global || e->visibility == PICodeParser::Public))
 				continue;
 			if (!makeClassJSON(rt, e)) return false;
 		}
@@ -265,7 +265,7 @@ int main(int argc, char * argv[]) {
 	                cli.hasArgument("Metainfo") || all,
 	                cli.hasArgument("Enum") || all,
 	                cli.hasArgument("Stream") || all,
-					cli.hasArgument("JSON") || all,
+	                cli.hasArgument("JSON") || all,
 	                cli.hasArgument("Text") || all,
 	                cli.hasArgument("Getter") || all))
 		return 1;
diff --git a/utils/code_model_generator/metainfo.cpp b/utils/code_model_generator/metainfo.cpp
index 54b1efe4..d8c518f7 100644
--- a/utils/code_model_generator/metainfo.cpp
+++ b/utils/code_model_generator/metainfo.cpp
@@ -106,8 +106,7 @@ void makeClassInfo(Runtime & rt, const PICodeParser::Entity * e) {
 	}
 	rt.ts << "\tci_ci[ci->name] = ci;\n";
 	if (e->parent_scope) {
-		rt.ts << "\tpci = "
-			  << "ci_ci.value(\"" << e->parent_scope->name << "\", 0);\n";
+		rt.ts << "\tpci = " << "ci_ci.value(\"" << e->parent_scope->name << "\", 0);\n";
 		rt.ts << "\tif (pci) pci->children_info << ci;\n";
 	}
 	for (const PICodeParser::Entity * p: e->parents)
diff --git a/utils/deploy_tool/main.cpp b/utils/deploy_tool/main.cpp
index 69b15942..5729392e 100644
--- a/utils/deploy_tool/main.cpp
+++ b/utils/deploy_tool/main.cpp
@@ -128,15 +128,10 @@ QtDep qt_deps[] = {QtDep("core", PIStringList() << "platforms"),
                    QtDep("sql", PIStringList() << "sqldrivers"),
                    QtDep("positioning", PIStringList() << "position"),
                    QtDep("location", PIStringList() << "geoservices"),
-                   QtDep("multimedia",
-                         PIStringList() << "audio"
-                                        << "mediaservice"
-                                        << "playlistformats"),
+                   QtDep("multimedia", PIStringList() << "audio" << "mediaservice" << "playlistformats"),
                    QtDep("printsupport", PIStringList() << "printsupport"),
                    QtDep("virtualkeyboard", PIStringList() << "platforminputcontexts"),
-                   QtDep("sensors",
-                         PIStringList() << "sensors"
-                                        << "sensorgestures"),
+                   QtDep("sensors", PIStringList() << "sensors" << "sensorgestures"),
                    QtDep("texttospeech", PIStringList() << "texttospeech"),
                    QtDep("serialbus", PIStringList() << "canbus"),
                    QtDep()};
@@ -270,8 +265,8 @@ void procLdd(PIString file, bool ext_lib = false, int cur_depth = 0) {
 	++cur_depth;
 	if (cur_depth > depth) return;
 	static PIStringList ignore_ext = {"png",      "jpg", "jpeg", "gif",  "bmp", "svg",  "tif",  "tiff", "ico",   "pdf",
-									  "txt",      "cfg", "conf", "json", "qml", "glsl", "fraq", "vert", "geom",  "qmltypes",
-									  "metainfo", "ts",  "qm",   "ttf",  "htm", "html", "md",   "sms",  "smsee", "blockmodel"};
+	                                  "txt",      "cfg", "conf", "json", "qml", "glsl", "fraq", "vert", "geom",  "qmltypes",
+	                                  "metainfo", "ts",  "qm",   "ttf",  "htm", "html", "md",   "sms",  "smsee", "blockmodel"};
 	PIString ext                   = PIFile::FileInfo(file).extension();
 	if (ignore_ext.contains(ext.toLowerCase())) return;
 	piCout << "scan" << file << "...";
@@ -707,14 +702,14 @@ int main(int argc, char * argv[]) {
 
 	qt_add_libs             = cli.argumentValue("qt-modules").split(DELIM).removeAll("");
 	auto getQtSubdir        = [&cli](const char * arg, PIString & var) {
-		var = cli.argumentValue(arg).trim();
-		if (var.isEmpty())
-			var = out_dir;
-		else {
-			if (!PIFile::FileInfo(var).isAbsolute()) var = out_dir + "/" + var;
-		}
-		if (!var.endsWith("/")) var += "/";
-		var.replaceAll("//", "/");
+        var = cli.argumentValue(arg).trim();
+        if (var.isEmpty())
+            var = out_dir;
+        else {
+            if (!PIFile::FileInfo(var).isAbsolute()) var = out_dir + "/" + var;
+        }
+        if (!var.endsWith("/")) var += "/";
+        var.replaceAll("//", "/");
 	};
 	getQtSubdir("qt-conf-dir", qt_conf_dir);
 	getQtSubdir("qt-plugins-dir", qt_plugins_dir);
diff --git a/utils/system_daemon/main.cpp b/utils/system_daemon/main.cpp
old mode 100755
new mode 100644
index 7c244cd8..6432f113
--- a/utils/system_daemon/main.cpp
+++ b/utils/system_daemon/main.cpp
@@ -184,19 +184,18 @@ public:
 		addrs_tl->content.clear();
 		peerinfo_tl->content.clear();
 		peermap_tl->content.clear();
-		peers_tl->content << TileList::Row(
-			"this | 0 | 0 | " + PIString::fromNumber(daemon_.allPeers().size_s())
-			//										   +  " [em = " + PIString::fromBool(daemon_.lockedEth()) + ",
-			//" 											"mm = " + PIString::fromBool(daemon_.lockedMBcasts()) + ", "
-			//"sm
-			//=
-			//"
-			//+ PIString::fromBool(daemon_.lockedSends()) + ", " 											"ms = " +
-			// PIString::fromBool(daemon_.lockedMCSends()) + ", " 											"pm = " + PIString::fromBool(pm)
-			// +
-			// "]"
-			,
-			CellFormat());
+		peers_tl->content << TileList::Row("this | 0 | 0 | " + PIString::fromNumber(daemon_.allPeers().size_s())
+		                                   //										   +  " [em = " +
+		                                   //PIString::fromBool(daemon_.lockedEth()) + ", " 											"mm
+		                                   //= " + PIString::fromBool(daemon_.lockedMBcasts()) + ", " "sm
+		                                   //=
+		                                   //"
+		                                   //+ PIString::fromBool(daemon_.lockedSends()) + ", " "ms = " +
+		                                   // PIString::fromBool(daemon_.lockedMCSends()) + ", " "pm = " + PIString::fromBool(pm)
+		                                   // +
+		                                   // "]"
+		                                   ,
+		                                   CellFormat());
 		for (const auto & p: daemon_.allPeers())
 			peers_tl->content << TileList::Row(p.name + " | d = " + PIString::fromNumber(p.dist) + " | p = " +
 			                                       PIString::fromNumber(p.ping()) + " | n = " + PIString::fromBool(p.isNeighbour()),
@@ -396,8 +395,7 @@ int main(int argc, char * argv[]) {
 	PIINTROSPECTION_START(pisd)
 	if (cli.hasArgument("daemon")) {
 		PIStringList args;
-		args << "-1"
-			 << "-s";
+		args << "-1" << "-s";
 		if (cli.hasArgument("force")) args << "-f";
 		if (cli.hasArgument("address")) args << "-a" << sip;
 		if (!name.isEmpty()) args << "-n" << name;
diff --git a/utils/translator/main.cpp b/utils/translator/main.cpp
index f8b548db..9220fb03 100644
--- a/utils/translator/main.cpp
+++ b/utils/translator/main.cpp
@@ -1,6 +1,6 @@
 /*
     PIP - Platform Independent Primitives
-	Translator
+    Translator
     Ivan Pelipenko peri4ko@yandex.ru
 
     This program is free software: you can redistribute it and/or modify
@@ -99,7 +99,7 @@ int main(int argc, char * argv[]) {
 	if (cli.hasArgument("Parse")) mode |= mParse;
 	if (cli.hasArgument("Compile")) mode |= mCompile;
 	if (cli.hasArgument("help") || cli.argumentValue("output").isEmpty() || cli.optionalArguments().isEmpty() ||
-		(mode != mParse && mode != mCompile)) {
+	    (mode != mParse && mode != mCompile)) {
 		usage();
 		return 0;
 	}
diff --git a/utils/translator/parser.cpp b/utils/translator/parser.cpp
index 073c28af..5b72bdde 100644
--- a/utils/translator/parser.cpp
+++ b/utils/translator/parser.cpp
@@ -6,11 +6,11 @@
 
 PIString fromCode(const PIString & in) {
 	return in.replacedAll("\\n", '\n')
-		.replaceAll("\\r", '\r')
-		.replaceAll("\\t", '\t')
-		.replaceAll("\\\"", '"')
-		.replaceAll("\\'", '\'')
-		.replaceAll("\\\\", '\\');
+	    .replaceAll("\\r", '\r')
+	    .replaceAll("\\t", '\t')
+	    .replaceAll("\\\"", '"')
+	    .replaceAll("\\'", '\'')
+	    .replaceAll("\\\\", '\\');
 }
 
 
@@ -22,10 +22,10 @@ void gatherStrings(TSFile::Content & content, const PIString & file, const PIStr
 	int len        = 0;
 	auto isCLetter = [](const PIChar c) { return c.isAlpha() || c.isDigit() || c == '_'; };
 	auto add       = [&content, file_loc, &count_all, &count_new](const PIString & source, const PIString & context, int line) {
-		if (source.isEmpty()) return;
-		++count_all;
-		if (content.contexts[context].confirm(fromCode(source), file_loc, line)) ++count_new;
-		// piCout << "Context = \"" << context << "\", message = \"" << source << "\" (" << file_loc << ":" << line << ")";
+        if (source.isEmpty()) return;
+        ++count_all;
+        if (content.contexts[context].confirm(fromCode(source), file_loc, line)) ++count_new;
+        // piCout << "Context = \"" << context << "\", message = \"" << source << "\" (" << file_loc << ":" << line << ")";
 	};
 	// piCout << "file" << file_loc;
 	for (const auto & kw: methods) {
diff --git a/utils/udp_file_transfer/main.cpp b/utils/udp_file_transfer/main.cpp
index c0218e1b..d1de7165 100644
--- a/utils/udp_file_transfer/main.cpp
+++ b/utils/udp_file_transfer/main.cpp
@@ -116,8 +116,7 @@ private:
 #endif
 			<< ft.stateString() << ft.curFile() << ft.diagnostic().receiveSpeed() << ft.diagnostic().sendSpeed() << "("
 			<< PIString::readableSize(ft.bytesFileCur()) << "/" << PIString::readableSize(ft.bytesFileAll()) << ", "
-			<< PIString::readableSize(ft.bytesCur()) << "/" << PIString::readableSize(ft.bytesAll()) << ")"
-			<< "ETA"
+			<< PIString::readableSize(ft.bytesCur()) << "/" << PIString::readableSize(ft.bytesAll()) << ")" << "ETA"
 			<< (ft.diagnostic().state().received_bytes_per_sec > 0
 		            ? PIString::fromNumber(
 						  PISystemTime::fromSeconds((ft.bytesAll() - ft.bytesCur()) / ft.diagnostic().state().received_bytes_per_sec)
diff --git a/utils/value_tree_translator/main.cpp b/utils/value_tree_translator/main.cpp
index 99246ab0..1a235df2 100644
--- a/utils/value_tree_translator/main.cpp
+++ b/utils/value_tree_translator/main.cpp
@@ -1,6 +1,6 @@
 /*
     PIP - Platform Independent Primitives
-	ValueTree translator
+    ValueTree translator
     Ivan Pelipenko peri4ko@yandex.ru
 
     This program is free software: you can redistribute it and/or modify
@@ -101,7 +101,7 @@ int main(int argc, char * argv[]) {
 		return 0;
 	}
 	if (cli.hasArgument("help") || cli.argumentValue("output").isEmpty() || cli.argumentValue("language").isEmpty() ||
-		cli.optionalArguments().isEmpty()) {
+	    cli.optionalArguments().isEmpty()) {
 		usage();
 		return 0;
 	}
@@ -137,8 +137,8 @@ int main(int argc, char * argv[]) {
 		if (ext == "conf") gatherStrings(context, PIValueTreeConversions::fromText(PIString::fromUTF8(f.readAll())), out_dir.relative(p));
 		if (ext == "json")
 			gatherStrings(context,
-						  PIValueTreeConversions::fromJSON(PIJSON::fromJSON(PIString::fromUTF8(f.readAll()))),
-						  out_dir.relative(p));
+			              PIValueTreeConversions::fromJSON(PIJSON::fromJSON(PIString::fromUTF8(f.readAll()))),
+			              out_dir.relative(p));
 		if (ext == "bin") gatherStrings(context, piDeserialize<PIValueTree>(f.readAll()), PIString());
 	}
 	piCout << Cyan << Bold << "Reading done";