improvments

- CHG: code improvements