Update notes for submitted changes

* Cleaned up endif/else-s in CMakeLists.txt and *.cmake files