Cleaned up revised setup.py and CMakeLists