Fix strings and format