Small changes - Cppooler