style: minor fixes, mostly as a followup to #665