NXP-13490: cleanup/format