fixup whitespace and style