NXP-15638: fformat + cleanup