about to refactor
Refactoring the code