NXP-12157 - cleanup & format