CHANGE: Refactor by sonar N3

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