#JC-1809: Fixed code review remarks