fix whitespace and prepare for localization