Improve CMakeList.txt