fix stupid bug of using CC in stead of CXX; clean code for pp