Better i18n and match wordpress code style