Properly expand table.* columns

Signed-off-by: Stephen Celis <stephen@stephencelis.com>
Consistency in multiple variable initialization

Signed-off-by: Stephen Celis <stephen@stephencelis.com>