Code cleanup and localization updates.