structural changes per code review