[KFSQA-983] changes made based on review comment