#JC-1431:
* Refactor code according to CR