Got rid of using lists in table generation

No longer need to create and then unpack a list, instead we can unpack
the generator.

cleaned up rows list creation to be more readable.