[SEBA-407] Minor refactoring to clarify logic

Change-Id: I5067a658553cd529b48c473a2cbdb7458aed414a
4 files changed