Cleanup, inttable to string table where appropriate