- CHG: code improvements