improvements

- CHG: code improvements