i18n swapping
Better comments