CPS-475 - fix sonar smells

Issue-ID: CPS-475

Change-Id: Ifbf14eaa93a8befa262a24499ab72b6c4cc2441c
Signed-off-by: JosephKeenan <joseph.keenan@est.tech>
2 files changed