optimize stucture

optimize stucture