update and simplify Makefile, add space in .cpp files