NXP-10974: format/cleanup