CHANGE: Fixed logger and fixed some sonar alarms

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