NXP-15135: cleanup & format
NXP-15135: use ConfigurationGenerator constants