[coding style] Changes from review