Cleaned up CMake files
Minor update in CMake files