Formatting
Simplifies JSON, changed asserts, and added test for using the Builder with closures