CMakeLists updated
Minor refactoring/inlining/cleanup