Cmake cleaning
Minor code cleaning