fixing makefile to properly clean
Prettified C++ code and header files
reverting make.inc