refactoring. utils class added