[ISSUE-2] Refactoring