Cleaning up the table class a bit