Test with bigger things by generating them a little smarter
Cleanup
formatting