Code style fixup