Cleaning up CMakelists.txt