Updated #JC-1486:
-refactor code according to CR