Code cleanup and show the aliases in the table.