#JC-1750: Fixed code review remarks