PR Review: Refactor and resolve comments

[Ayush8923]

Is your feature request related to a problem?
PR #122 has several comments regarding code refactoring and improvements that need to be addressed, preventing the PR from being merged.

Describe the solution you'd like

• Review all comments in the PR
• Resolve each comment by:
  • Refactoring code where suggested
  • Improving folder structure if needed
  • Applying clean code practices
  • Fixing any functional or edge-case issues
• Perform the following tasks:
  • Go through all review comments
  • Implement required changes
  • Ensure no regressions are introduced
  • Re-request review after updates

Original issue

Describe the current behavior

• PR #122 has multiple review comments related to refactoring, code structure, and improvements.
• These comments need to be addressed before the PR can be merged.

Describe the enhancement you'd like

• Review all comments mentioned in the PR review.

• Resolve each comment by:
  • Refactoring code where suggested
  • Improving folder structure if needed
  • Applying clean code practices
  • Fixing any functional or edge-case issues

Tasks

• Go through all review comments
• Implement required changes
• Ensure no regressions are introduced
• Re-request review after updates