optimize  build classes

optimize  build classes