CON-1784 | simpliyfying code