code structural updates