Tweaks to the NCF encoding namespace and corresponding code changes.
Catch up with formatting fixes