ajust code structure