Code format cleanup
Added stronger invariant to generated code
Increased number of sizes benchmarked