Fix non ASCII and move braces to easier to read places