refacotred utils
Refactoring