NXP-15621: Fix diff styles + format