CON-1163 | simplified code and comment after CR