BUG-731: reduced complexity

Change-Id: I9573e625ab6eb050b7ad33325cfd7a165944105a
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>