More I18N, cleaning some code.