Cleanup

Code cleanup and test of the c++ use in QT-creatore.