code structure adjustment