commiting cleaned version for c++