Refactored C++ TLG6 reading
Removed the rest of #defines
Improved formatting