fixup messed up whitespace and similar