improve a few syntax points