chg code structure a bit