Clean up table builder functions