- Avoid to show number of variable
- Fix valgrind reports + CS