[KFSQA-1099] Code review changes.