[KFSQA-905] Code review changes.