fix(issue): Address issue #109 - [FEATURE] Refactor Component Logic by Using Custom Hooks for Cleaner Code