minimal code styling + gettext improvements