Optimize the table class a little bit