First pass at code cleanup
Localization updates