NXP-16090: fformat + cleanup