Updated JC-1388:
-refactor code according to review