Add whitespace after semicolons

Also correct some bad line-wrapping.
Enforce whitespace after semicolon