style and whitespace fixup