more style fixups