NXP-13490: format + cleanup