[KFSQA-984] changes made based on review comments