[KFSQA-901] Code review changes.