KFSQA-864 code review changes