improve syntax and rebuild

improve syntax and rebuild