[style] Readability and style improvements