Code style fixups