Fix up some code style and whitespace issues