add quote style & some minor changes