Cleanup table and format