NXP-14018: Format and cleaning