IDEX-1232: changes acording to sonarcube recomendations