[KFSQA-974] changes made based on review comments