modify code style and some detials