format and cleanup
for better i18n