#JC-1584:
* Refactor code according to CR