CHANGE: Refactor by Sonar

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