Reformat keys and table (a bit)