Conversation
perkinsjr
requested review from
chronark,
mcstepp and
ogzhanolguncu
as code owners
|
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
1 Skipped Deployment
|
📝 WalkthroughWalkthroughThe changes involve the removal of a specific CSS rule set that targets the Changes
Suggested labels
Suggested reviewers
✨ Finishing Touches
🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
|
Thank you for following the naming conventions for pull request titles! 🙏 |
perkinsjr
changed the title
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 0
🔭 Outside diff range comments (1)
apps/dashboard/lib/trpc/routers/index.ts (1)
33-71: 💡 Verification agent❓ Verification inconclusive
Note: Import changes don't match PR objective.
The PR objective mentions removing CSS for a non-existent alert, but these changes reorganize imports. Consider updating the PR description to accurately reflect all changes or ensure the CSS changes are included in other files.
🏁 Script executed:
#!/bin/bash # Let's verify if there are CSS changes in this PR that would align with the PR objective git diff HEAD^ HEAD -- "*.css" | grep -i "root-key-alert-title"Length of output: 65
Action Required: Update PR Description to Match Actual Changes
After verifying via the CSS diff script, no changes related to the
root-key-alert-titlewere detected. The modifications inapps/dashboard/lib/trpc/routers/index.tsonly involve reorganizing imports, while the PR objective mentions CSS removal for a non-existent alert. Please update the PR description to accurately reflect the implemented changes or include the missing CSS modifications if they were intended.
- Verify that the reorganization of imports is the only change.
- Update the PR description to match the reorganization or add the intended CSS removals if necessary.
🧹 Nitpick comments (1)
biome.json (1)
43-43: Ensure consistent ignore pattern formatting.The
"linter"ignore list now includes"./internal/auth-migrator/"with a trailing slash, while in the"formatter"and"organizeImports"sections, the same directory is added without a trailing slash. Consider standardizing the format across all sections to prevent any confusion or mismatches in directory pattern matching.
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (52)
apps/api/src/benchmarks/ratelimit_latency.test.ts(1 hunks)apps/dashboard/app/(app)/api/auth/refresh/route.ts(1 hunks)apps/dashboard/app/(app)/apis/[apiId]/keys/[keyAuthId]/[keyId]/settings/update-key-expiration.tsx(1 hunks)apps/dashboard/app/(app)/settings/team/client.tsx(2 hunks)apps/dashboard/app/(app)/settings/team/invitations.tsx(1 hunks)apps/dashboard/app/(app)/settings/team/invite.tsx(2 hunks)apps/dashboard/app/(app)/settings/team/members.tsx(2 hunks)apps/dashboard/app/(app)/settings/team/page.tsx(1 hunks)apps/dashboard/app/(app)/settings/team/role-switcher.tsx(1 hunks)apps/dashboard/app/(app)/settings/team/status-badge.tsx(1 hunks)apps/dashboard/app/auth/actions.ts(1 hunks)apps/dashboard/app/auth/context/signup-context.tsx(1 hunks)apps/dashboard/app/auth/hooks/useSignIn.ts(1 hunks)apps/dashboard/app/auth/hooks/useSignUp.ts(1 hunks)apps/dashboard/app/auth/join/route.ts(2 hunks)apps/dashboard/app/auth/sign-in/[[...sign-in]]/page.tsx(2 hunks)apps/dashboard/app/auth/sign-in/email-code.tsx(1 hunks)apps/dashboard/app/auth/sign-in/email-signin.tsx(1 hunks)apps/dashboard/app/auth/sign-in/email-verify.tsx(1 hunks)apps/dashboard/app/auth/sign-in/oauth-signin.tsx(1 hunks)apps/dashboard/app/auth/sign-in/org-selector.tsx(1 hunks)apps/dashboard/app/auth/sign-up/[[...sign-up]]/page.tsx(1 hunks)apps/dashboard/app/auth/sign-up/email-code.tsx(1 hunks)apps/dashboard/app/auth/sign-up/email-signup.tsx(1 hunks)apps/dashboard/app/auth/sign-up/oauth-signup.tsx(1 hunks)apps/dashboard/app/auth/sso-callback/[[...sso-callback]]/route.ts(1 hunks)apps/dashboard/app/integrations/vercel/callback/workspace.tsx(1 hunks)apps/dashboard/app/new/create-workspace.tsx(1 hunks)apps/dashboard/app/new/page.tsx(1 hunks)apps/dashboard/components/dashboard/confirm.tsx(1 hunks)apps/dashboard/components/navigation/sidebar/team-switcher.tsx(2 hunks)apps/dashboard/components/navigation/sidebar/user-button.tsx(1 hunks)apps/dashboard/components/ui/pagination.tsx(0 hunks)apps/dashboard/lib/auth/base-provider.ts(1 hunks)apps/dashboard/lib/auth/utils.ts(2 hunks)apps/dashboard/lib/auth/workos.ts(2 hunks)apps/dashboard/lib/trpc/routers/index.ts(2 hunks)apps/dashboard/lib/trpc/routers/org/getInvitationList.ts(1 hunks)apps/dashboard/lib/trpc/routers/org/getOrg.ts(1 hunks)apps/dashboard/lib/trpc/routers/org/getOrganizationMemberList.ts(1 hunks)apps/dashboard/lib/trpc/routers/org/inviteMember.ts(1 hunks)apps/dashboard/lib/trpc/routers/org/removeMembership.ts(1 hunks)apps/dashboard/lib/trpc/routers/org/revokeInvitation.ts(1 hunks)apps/dashboard/lib/trpc/routers/org/updateMembership.ts(1 hunks)apps/dashboard/lib/trpc/routers/user/getCurrentUser.ts(1 hunks)apps/dashboard/lib/trpc/routers/user/listMemberships.ts(1 hunks)apps/dashboard/lib/trpc/routers/user/switchOrg.ts(1 hunks)apps/dashboard/lib/trpc/trpc.ts(1 hunks)apps/dashboard/pages/api/v1/workos/webhooks.ts(1 hunks)apps/www/components/ui/pagination.tsx(0 hunks)biome.json(3 hunks)packages/ratelimit/src/index.ts(1 hunks)
💤 Files with no reviewable changes (2)
- apps/www/components/ui/pagination.tsx
- apps/dashboard/components/ui/pagination.tsx
✅ Files skipped from review due to trivial changes (45)
- apps/dashboard/lib/trpc/routers/org/getInvitationList.ts
- apps/dashboard/lib/trpc/trpc.ts
- apps/dashboard/lib/trpc/routers/org/inviteMember.ts
- apps/dashboard/components/navigation/sidebar/user-button.tsx
- apps/dashboard/lib/trpc/routers/user/listMemberships.ts
- apps/dashboard/app/(app)/settings/team/status-badge.tsx
- apps/dashboard/app/(app)/api/auth/refresh/route.ts
- apps/dashboard/app/auth/sign-up/oauth-signup.tsx
- apps/dashboard/app/auth/hooks/useSignIn.ts
- apps/dashboard/lib/trpc/routers/org/revokeInvitation.ts
- apps/dashboard/components/navigation/sidebar/team-switcher.tsx
- apps/dashboard/app/auth/sign-in/org-selector.tsx
- apps/dashboard/lib/trpc/routers/user/getCurrentUser.ts
- apps/dashboard/app/(app)/settings/team/page.tsx
- apps/dashboard/app/auth/sign-in/email-verify.tsx
- apps/dashboard/app/(app)/apis/[apiId]/keys/[keyAuthId]/[keyId]/settings/update-key-expiration.tsx
- apps/dashboard/lib/auth/base-provider.ts
- apps/dashboard/app/(app)/settings/team/members.tsx
- apps/dashboard/app/auth/sign-in/email-signin.tsx
- apps/dashboard/app/new/create-workspace.tsx
- apps/dashboard/app/auth/hooks/useSignUp.ts
- apps/dashboard/lib/trpc/routers/user/switchOrg.ts
- apps/dashboard/lib/trpc/routers/org/getOrg.ts
- apps/api/src/benchmarks/ratelimit_latency.test.ts
- packages/ratelimit/src/index.ts
- apps/dashboard/app/(app)/settings/team/invitations.tsx
- apps/dashboard/lib/trpc/routers/org/getOrganizationMemberList.ts
- apps/dashboard/lib/trpc/routers/org/updateMembership.ts
- apps/dashboard/app/integrations/vercel/callback/workspace.tsx
- apps/dashboard/lib/auth/utils.ts
- apps/dashboard/components/dashboard/confirm.tsx
- apps/dashboard/app/(app)/settings/team/client.tsx
- apps/dashboard/app/(app)/settings/team/role-switcher.tsx
- apps/dashboard/app/(app)/settings/team/invite.tsx
- apps/dashboard/app/auth/context/signup-context.tsx
- apps/dashboard/lib/auth/workos.ts
- apps/dashboard/app/auth/sign-in/[[...sign-in]]/page.tsx
- apps/dashboard/app/auth/sign-in/oauth-signin.tsx
- apps/dashboard/app/new/page.tsx
- apps/dashboard/app/auth/sign-up/email-signup.tsx
- apps/dashboard/app/auth/sso-callback/[[...sso-callback]]/route.ts
- apps/dashboard/app/auth/sign-up/[[...sign-up]]/page.tsx
- apps/dashboard/app/auth/sign-in/email-code.tsx
- apps/dashboard/lib/trpc/routers/org/removeMembership.ts
- apps/dashboard/app/auth/actions.ts
⏰ Context from checks skipped due to timeout of 90000ms (14)
- GitHub Check: Test Go API Local / Test (Shard 2/8)
- GitHub Check: Test Go API Local / Test (Shard 7/8)
- GitHub Check: Test Go API Local / Test (Shard 6/8)
- GitHub Check: Test Go API Local / Test (Shard 1/8)
- GitHub Check: Test Go API Local / Test (Shard 8/8)
- GitHub Check: Test Packages / Test ./packages/cache
- GitHub Check: Test Go API Local / Test (Shard 3/8)
- GitHub Check: Test Packages / Test ./packages/api
- GitHub Check: Test Packages / Test ./packages/nextjs
- GitHub Check: Test Packages / Test ./internal/clickhouse
- GitHub Check: Test API / API Test Local
- GitHub Check: Test Agent Local / test_agent_local
- GitHub Check: Build / Build
- GitHub Check: Analyze (javascript-typescript)
🔇 Additional comments (9)
apps/dashboard/pages/api/v1/workos/webhooks.ts (1)
3-3: Fixed missing WorkOS importThis change uncomments the WorkOS import, which is necessary since the code uses
WorkOSon line 19 to construct the WorkOS client and access webhook functionality. Without this import, the code would have thrown runtime errors.The fix aligns with the PR objective of addressing issues while maintaining functionality.
apps/dashboard/app/auth/sign-up/email-code.tsx (1)
10-10: This import is necessary for the component to function properly.The component uses
useSignUphook functions at line 13, so this import is required for the code to work correctly. This change ensures the component can access the hook's functionality.apps/dashboard/app/auth/join/route.ts (3)
2-2: LGTM: TypeScript syntax improvementGood change. Adding the
typekeyword to theNextRequestimport clarifies that it's only used for type checking and will be removed during compilation, potentially improving bundle size.
47-54: Improved conditional logic flowThe restructured code simplifies the flow for handling unauthenticated users. The flattened logic is more readable and easier to follow than the previous nested structure that was removed.
55-58: LGTM: Clean continuation of the refactored flowThis segment completes the refactoring by handling the case where no existing user is found. The code now has a clean linear flow: check for authenticated user → check for existing user → handle sign-in or sign-up redirection accordingly.
biome.json (2)
65-67: Addition of new ignore path to formatter configuration.The new entry
"./internal/auth-migrator"has been added to the"formatter"ignore list to ensure that files within this directory are excluded from automated formatting. This change is clear and aligns with the intent to isolate files that might otherwise trigger unnecessary formatting.
78-80: Addition of new ignore path to organizeImports configuration.The new entry
"./internal/auth-migrator"in the"organizeImports"ignore list appropriately extends the exclusion rules to this directory, ensuring that automated import organization does not process files in the internal auth migrator.apps/dashboard/lib/trpc/routers/index.ts (2)
33-41: Clean import organization looks good.This change consolidates organization-related functions into a single import from the "./org" module, improving code organization without changing functionality.
71-71: LGTM - Import positioning is consistent.Repositioning this import statement to follow the organization-related imports maintains a logical grouping of related functionality.
There was a problem hiding this comment.
Actionable comments posted: 0
🔭 Outside diff range comments (2)
apps/dashboard/components/logs/checkbox/filter-checkbox.tsx (2)
221-239: 💡 Verification agent❓ Verification inconclusive
Complete the checkbox-label association for individual checkboxes.
You've added
htmlForto connect the labels to their checkboxes, which is good for accessibility. However, the Checkbox components don't have correspondingidattributes. Please add matching IDs to make this connection work properly:<Checkbox + id={`checkbox-${checkbox.id}`} checked={checkbox.checked} className="size-4 rounded border-gray-4 [&_svg]:size-3" onClick={() => handleCheckboxClick(index)} />Similar to the select-all checkbox, consider reviewing whether having
role="checkbox"on the label creates redundant or potentially confusing accessibility semantics.
Accessibility: Complete Checkbox-Label Association and Role Usage
- The label’s
htmlFornow properly references an ID, but theCheckboxcomponent is missing anidattribute. Please add:<Checkbox + id={`checkbox-${checkbox.id}`} checked={checkbox.checked} className="size-4 rounded border-gray-4 [&_svg]:size-3" onClick={() => handleCheckboxClick(index)} />- Additionally, review whether adding
role="checkbox"on the<label>is redundant given that the native<input type="checkbox" />semantics are handled internally by theCheckboxcomponent.
200-217: 💡 Verification agent🧩 Analysis chain
Improve accessibility by completing the label-checkbox association.
Adding the
htmlForattribute to the label is a good accessibility improvement, but I don't see a correspondingid="select-all-checkbox"on the Checkbox component. For this accessibility enhancement to work properly, you need to add the matching ID to the Checkbox.<Checkbox + id="select-all-checkbox" checked={checkboxes.every((checkbox) => checkbox.checked)} className="size-4 rounded border-gray-4 [&_svg]:size-3" onClick={handleSelectAll} />Also note that having
role="checkbox"on the label while the actual Checkbox component exists inside it creates potentially confusing semantics for screen readers.
Based on the expected output (i.e. that the
idattribute is missing on the Checkbox), the review comment correctly identifies an accessibility issue:Ensure proper label association and clarify accessibility semantics in the select-all Checkbox
Accessibility Fix: The label uses
htmlFor="select-all-checkbox", but the Checkbox component lacks a matchingid="select-all-checkbox". Please add this ID:<Checkbox + id="select-all-checkbox" checked={checkboxes.every((checkbox) => checkbox.checked)} className="size-4 rounded border-gray-4 [&_svg]:size-3" onClick={handleSelectAll} />Semantic Note: Having
role="checkbox"on the<label>while the actual interactive Checkbox is nested inside it may cause confusing semantics for screen readers. Consider removing the role from the label if the Checkbox component correctly manages its own accessibility roles.
🏁 Script executed:
#!/bin/bash # Verify if the Checkbox component in the specified file includes the required id attribute grep -R "id=\"select-all-checkbox\"" apps/dashboard/components/logs/checkbox/filter-checkbox.tsx || echo "ID attribute not found in file"Length of output: 289
Update Accessibility for Select-All Checkbox
Fix Required: The label’s
htmlFor="select-all-checkbox"does not match any element since theCheckboxcomponent is missing the correspondingidattribute.
- Action: Add the
id="select-all-checkbox"attribute to theCheckboxcomponent as shown below:<Checkbox + id="select-all-checkbox" checked={checkboxes.every((checkbox) => checkbox.checked)} className="size-4 rounded border-gray-4 [&_svg]:size-3" onClick={handleSelectAll} />Additional Note: Having
role="checkbox"on the<label>while the interactiveCheckbox(that already manages its own accessibility behaviors) is nested inside might create conflicting semantics for screen readers. Consider removing the role from the label or ensuring that the Checkbox’s role is properly defined.
🧹 Nitpick comments (1)
apps/dashboard/components/logs/checkbox/filter-checkbox.tsx (1)
203-203: Consider addressing accessibility issues rather than ignoring linting rules.You've expanded the Biome rules to ignore with
lint/a11y/useSemanticElements. While this addresses the linting errors, it might be better to fix the underlying accessibility issues by:
- Using proper semantic HTML structure for checkboxes
- Removing the
role="checkbox"from labels (as labels shouldn't themselves be checkboxes)- Ensuring proper focus and keyboard handling on the actual checkbox elements
This would create a more accessible experience and avoid the need to ignore linting rules.
Also applies to: 226-226
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (23)
apps/dashboard/app/(app)/apis/[apiId]/keys/[keyAuthId]/keys.tsx(1 hunks)apps/dashboard/app/(app)/apis/[apiId]/settings/update-api-name.tsx(1 hunks)apps/dashboard/app/(app)/apis/[apiId]/settings/update-ip-whitelist.tsx(1 hunks)apps/dashboard/app/(app)/identities/[identityId]/page.tsx(1 hunks)apps/dashboard/app/(app)/logs/components/controls/components/logs-display/components/display-popover.tsx(1 hunks)apps/dashboard/app/(app)/settings/general/update-workspace-name.tsx(1 hunks)apps/dashboard/app/integrations/vercel/callback/client.tsx(1 hunks)apps/dashboard/app/new/page.tsx(3 hunks)apps/dashboard/components/logs/checkbox/filter-checkbox.tsx(2 hunks)apps/dashboard/components/logs/checkbox/filters-popover.tsx(1 hunks)apps/dashboard/components/logs/datetime/suggestions.tsx(1 hunks)apps/dashboard/components/logs/llm-search/hooks/use-search-strategy.ts(1 hunks)apps/dashboard/components/logs/overview-charts/hooks.tsx(1 hunks)apps/dashboard/components/logs/overview-charts/overview-area-chart-loader.tsx(1 hunks)apps/play/app/page.tsx(2 hunks)apps/play/components/ui/terminalInput.tsx(1 hunks)apps/www/app/about/page.tsx(3 hunks)apps/www/app/accelerate/components/rive.tsx(3 hunks)apps/www/app/globals.css(1 hunks)apps/www/components/blog/blog-card.tsx(1 hunks)apps/www/components/tag-filter.tsx(1 hunks)apps/www/components/youtube-embed.tsx(1 hunks)biome.json(4 hunks)
✅ Files skipped from review due to trivial changes (8)
- apps/dashboard/app/integrations/vercel/callback/client.tsx
- apps/dashboard/components/logs/checkbox/filters-popover.tsx
- apps/www/app/globals.css
- apps/dashboard/components/logs/llm-search/hooks/use-search-strategy.ts
- apps/dashboard/components/logs/datetime/suggestions.tsx
- apps/dashboard/app/(app)/logs/components/controls/components/logs-display/components/display-popover.tsx
- apps/dashboard/components/logs/overview-charts/overview-area-chart-loader.tsx
- apps/dashboard/components/logs/overview-charts/hooks.tsx
🚧 Files skipped from review as they are similar to previous changes (2)
- biome.json
- apps/dashboard/app/new/page.tsx
⏰ Context from checks skipped due to timeout of 90000ms (14)
- GitHub Check: Test Go API Local / Test (Shard 8/8)
- GitHub Check: Test Packages / Test ./internal/clickhouse
- GitHub Check: Test Go API Local / Test (Shard 4/8)
- GitHub Check: Test Packages / Test ./internal/keys
- GitHub Check: Test Go API Local / Test (Shard 2/8)
- GitHub Check: Test Go API Local / Test (Shard 6/8)
- GitHub Check: Test Go API Local / Test (Shard 3/8)
- GitHub Check: Test Go API Local / Test (Shard 7/8)
- GitHub Check: Test Packages / Test ./internal/id
- GitHub Check: Test Packages / Test ./packages/api
- GitHub Check: Test API / API Test Local
- GitHub Check: Build / Build
- GitHub Check: Test Agent Local / test_agent_local
- GitHub Check: Analyze (javascript-typescript)
🔇 Additional comments (16)
apps/dashboard/app/(app)/settings/general/update-workspace-name.tsx (1)
66-68: Good accessibility improvement!Adding the
htmlForattribute to the label element properly associates it with the input field, improving accessibility for screen reader users.apps/www/app/accelerate/components/rive.tsx (2)
50-60: Good optimization with useCallback!Converting the
onClickDayfunction to a memoized callback prevents unnecessary function recreations on re-renders, which improves performance.
101-101: Great dependency array update!Adding
onClickDayto the dependency array ensures the effect correctly references the latest version of the callback. This is an important fix that prevents potential stale closure issues.apps/dashboard/app/(app)/identities/[identityId]/page.tsx (1)
141-141: Nice addition of the key prop!Adding a unique
keyprop to theTableRowcomponent in the mapping function is essential for React's reconciliation process. It helps React identify which items have changed, been added, or removed, improving rendering performance.apps/www/components/tag-filter.tsx (1)
19-19: Good React list rendering practice!Adding the
keyprop to elements in a list mapping is a React best practice. This helps React's reconciliation algorithm efficiently update the DOM by properly identifying which items have changed.apps/dashboard/app/(app)/apis/[apiId]/settings/update-api-name.tsx (1)
79-81: Accessibility improvement with properly associated labelThe addition of the
htmlForattribute correctly associates the label with the input field, following accessibility best practices. This ensures screen readers can properly identify the purpose of the input control.apps/play/components/ui/terminalInput.tsx (1)
40-42: Accessibility enhancement for terminal inputAdding the
htmlForattribute to the label creates a proper association with the textarea element named "input", improving accessibility for screen readers. The label now correctly identifies the purpose of the input control.apps/dashboard/app/(app)/apis/[apiId]/keys/[keyAuthId]/keys.tsx (1)
95-95: React performance improvement with unique keyAdding the
keyprop usingexternalIdas a unique identifier is an excellent fix. This helps React's reconciliation process efficiently update the DOM when rendering lists of elements, preventing potential issues with component state and improving rendering performance.apps/www/components/youtube-embed.tsx (1)
63-63: React element key additionAdding a key to the div element within the
sourcesarray helps React's reconciliation process. Since this element appears in an array passed to the FsLightbox component, having a key is good practice for optimal rendering.apps/play/app/page.tsx (2)
785-785: Good React key addition!Adding a unique
key={key}to the div within theObject.entries(step.endpoint.fields).map()function follows React best practices for rendering lists. This helps React efficiently track and update components when fields change.
822-827: Good accessibility improvement!Adding
htmlFor="curl"to the label andid="curl"to the Textarea creates a proper association between the label and the form control. This is an important accessibility improvement that helps screen reader users understand the purpose of the textarea.apps/dashboard/app/(app)/apis/[apiId]/settings/update-ip-whitelist.tsx (1)
85-87: Great accessibility improvement!Adding a label with
htmlFor="ipWhitelist"that's visually hidden withsr-onlyis an excellent accessibility practice. This ensures screen readers can properly identify the purpose of the input field while maintaining the current visual design.apps/www/components/blog/blog-card.tsx (1)
52-54: Good addition of the key prop.Adding the
key={tag}prop to elements rendered in a map function is a React best practice. This helps React's reconciliation algorithm efficiently identify which items have changed, been added, or been removed, improving performance and preventing potential issues.apps/www/app/about/page.tsx (3)
187-187: Properly added key prop to mapped element.Adding the
key={label}prop to this mapped div is a React best practice that helps with efficient rendering and reconciliation.
353-356: Correctly added key prop to investor item.Adding the
key={name}prop to the investor div elements is an important React pattern for list rendering that prevents rendering issues and improves performance.
376-377: Good addition of key prop to blog post container.Adding the
key={post.slug}prop to the blog post div element ensures proper React list rendering and reconciliation. Using the slug as a key is a good choice since it should be unique across blog posts.
2 participants
What does this PR do?
Fixes every biome issue, that throws errors doesn't change functionality across our entire site:
Mostly labels, Ally, adding key's, use useEffect correctly, Import sorting etc.
Type of change
Summary by CodeRabbit
Style
Refactor