[SUITEDEV-2114] remove underscore dependency, refactor / make the code simpler