Add new enforcement tool
Minor fixup
Minor enhancement
Add JSON simplification function