[style] Some cleanup.