Some refactoring / code cleanup / translation updates.