[KFSQA-677] changes made based on review comments