few more style fixups