NXP-15315 code cleanup
NXP-15315 fixup random bug inner class running