#JC-1595:
* Refactor code according to CR