Clean up for cxxgen
Merge pull request #52 from pbrunet/master

Clean up for cxxgen.py