More updates to i18n

Bit of cleaning up