* Minor improvements in code readability in GTL module.