Rename constant
Minor code clean-up
Uniform spacing in CMakeLists.txt