[INTERNAL,NOP] Modifies CMakeLists to reduce number of object files build. Fixes some whitespace issues.