[refactor]
- refactoring the code