Work on CMake.
Little code cleaning.