CHANGE: Refactor with help sonar

Signed-off-by: arturkandurengagepoint <arturkandur@engagepoint.com>