fixed format & some typo