Port 22

Improving C++