Code cleanup.
Use of string tables.