Minor cleanup of Config.cpp and removed some unused global variables.
Consistent formatting.
Cleanup of unused global variables.