[KFSQA-1011] Changes based on review comments