Mostly fixing whitespace and stray semicolons