whitespace/style fixups