small parsing tidy-up