fix formatting and typo

making it consistent - can't say I'm a fan of the long lines though,
diffs are going to be ugly