NXP-11064: cleanup/format