Some reformatting of table