Refactor of utils
Fix some refactor issues
Merge pull request #323 from owdqa/feature/OWD-33103-Refactor_Utils

Refactor of utils