function call and style fixups