NXP-13313: cleanup and format