BAP-376 Code review fixes
BAP-376
Code review fixes

mszajner/platform,trustify/oroplatform,umpirsky/platform,2ndkauboy/platform,morontt/platform,2ndkauboy/platform,ramunasd/platform,hugeval/platform,Djamy/platform,morontt/platform,Djamy/platform,geoffroycochard/platform,morontt/platform,northdakota/platform,northdakota/platform,trustify/oroplatform,northdakota/platform,orocrm/platform,ramunasd/platform,akeneo/platform,mszajner/platform,akeneo/platform,mszajner/platform,orocrm/platform,geoffroycochard/platform,akeneo/platform,umpirsky/platform,2ndkauboy/platform,ramunasd/platform,hugeval/platform,hugeval/platform,trustify/oroplatform,geoffroycochard/platform,orocrm/platform,Djamy/platform