NXP-14955: format/cleanup
NXP-14955: better assertions to help fixing in case of failure