Cleaning up CMakelists