#JC-552: Fixed code review remarks