Cleaned up and commented cmake changes