-- fix warnings
Refactoring: move utils methods