Fix in-string syntax errors going missing and tweak style