* Refactoring: moved util functions to module
* Tested utils