optimize structure

optimize structure