Improve table structure