Internationalize strings, clean-up.